drm/fsl-dcu: use clk helpers

Use clk_prepare_enable and clk_disable_unprepare helpers. This also
fixes a sequence issue in the enable path (which leads to a warning
on resume).

diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index 2cb8da97ee07fe85eda615a595ddaa0ae1a5dabe..52045c1e41546889d28611e8daa5a812b548195d 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -248,8 +248,7 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
        regcache_cache_only(fsl_dev->regmap, true);
        regcache_mark_dirty(fsl_dev->regmap);
        fsl_tcon_suspend(fsl_dev->tcon);
-       clk_disable(fsl_dev->clk);
-       clk_unprepare(fsl_dev->clk);
+       clk_disable_unprepare(fsl_dev->clk);
 
        return 0;
 }
@@ -262,15 +261,9 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
        if (!fsl_dev)
                return 0;
 
-       ret = clk_enable(fsl_dev->clk);
+       ret = clk_prepare_enable(fsl_dev->clk);
        if (ret < 0) {
                dev_err(dev, "failed to enable dcu clk\n");
-               clk_unprepare(fsl_dev->clk);
-               return ret;
-       }
-       ret = clk_prepare(fsl_dev->clk);
-       if (ret < 0) {
-               dev_err(dev, "failed to prepare dcu clk\n");
                return ret;
        }