fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Mon, 28 Oct 2013 22:49:29 +0000 (23:49 +0100)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 11 Nov 2013 13:33:15 +0000 (15:33 +0200)
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
clk_disable_unprepare() to get ready for the migration to the common
clock framework.

Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/sh_mobile_lcdcfb.c

index 0264704a52be3d9e02b23178e489b2e567ec4c56..eaeae0fd096297014eb4bc5993bc2ebf337b41a9 100644 (file)
@@ -344,7 +344,7 @@ static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv)
 {
        if (atomic_inc_and_test(&priv->hw_usecnt)) {
                if (priv->dot_clk)
-                       clk_enable(priv->dot_clk);
+                       clk_prepare_enable(priv->dot_clk);
                pm_runtime_get_sync(priv->dev);
                if (priv->meram_dev && priv->meram_dev->pdev)
                        pm_runtime_get_sync(&priv->meram_dev->pdev->dev);
@@ -358,7 +358,7 @@ static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv)
                        pm_runtime_put_sync(&priv->meram_dev->pdev->dev);
                pm_runtime_put(priv->dev);
                if (priv->dot_clk)
-                       clk_disable(priv->dot_clk);
+                       clk_disable_unprepare(priv->dot_clk);
        }
 }