Re: [PATCH 09/13] drm/meson: dw-hdmi: Use devm_clk_get_enabled() helper

[Neil Armstrong]

On 5/18/26 21:47, Jonas Karlman wrote:

Change to use the devm_clk_get_enabled() helper instead of using an
open-coded variant.

Signed-off-by: Jonas Karlman <jo...@kwiboo.se>
---
  drivers/gpu/drm/meson/meson_dw_hdmi.c | 48 +++++++++------------------
  1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c 
b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index fcd2426af9fc..d0cf2042d41c 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -634,29 +634,6 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi 
*meson_dw_hdmi)

} -static void meson_disable_clk(void *data)

-{
-       clk_disable_unprepare(data);
-}
-
-static int meson_enable_clk(struct device *dev, char *name)
-{
-       struct clk *clk;
-       int ret;
-
-       clk = devm_clk_get(dev, name);
-       if (IS_ERR(clk)) {
-               dev_err(dev, "Unable to get %s pclk\n", name);
-               return PTR_ERR(clk);
-       }
-
-       ret = clk_prepare_enable(clk);
-       if (!ret)
-               ret = devm_add_action_or_reset(dev, meson_disable_clk, clk);
-
-       return ret;
-}
-
  static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
                                void *data)
  {
@@ -666,6 +643,7 @@ static int meson_dw_hdmi_bind(struct device *dev, struct 
device *master,
        struct drm_device *drm = data;
        struct meson_drm *priv = drm->dev_private;
        struct dw_hdmi_plat_data *dw_plat_data;
+       struct clk *clk;
        int irq;
        int ret;

@@ -716,17 +694,23 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,

        if (IS_ERR(meson_dw_hdmi->hdmitx))
                return PTR_ERR(meson_dw_hdmi->hdmitx);

- ret = meson_enable_clk(dev, "isfr");

-       if (ret)
-               return ret;
+       clk = devm_clk_get_enabled(dev, "isfr");
+       if (IS_ERR(clk)) {
+               dev_err(dev, "Unable to get isfr pclk\n");
+               return PTR_ERR(clk);
+       }

- ret = meson_enable_clk(dev, "iahb");

-       if (ret)
-               return ret;
+       clk = devm_clk_get_enabled(dev, "iahb");
+       if (IS_ERR(clk)) {
+               dev_err(dev, "Unable to get iahb pclk\n");
+               return PTR_ERR(clk);
+       }

- ret = meson_enable_clk(dev, "venci");

-       if (ret)
-               return ret;
+       clk = devm_clk_get_enabled(dev, "venci");
+       if (IS_ERR(clk)) {
+               dev_err(dev, "Unable to get venci pclk\n");
+               return PTR_ERR(clk);
+       }

dw_plat_data->regm = devm_regmap_init(dev, NULL, meson_dw_hdmi,

                                              &meson_dw_hdmi_regmap_config);

Reviewed-by: Neil Armstrong <neil.armstr...@linaro.org>

Thanks,
Neil