From mboxrd@z Thu Jan 1 00:00:00 1970 From: plagnioj@jcrosoft.com (Jean-Christophe PLAGNIOL-VILLARD) Date: Thu, 31 Oct 2013 11:47:40 +0100 Subject: [PATCH 12/12] fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare In-Reply-To: <1383000569-8916-13-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1383000569-8916-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> <1383000569-8916-13-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Message-ID: <20131031104740.GA18477@ns203013.ovh.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 23:49 Mon 28 Oct , Laurent Pinchart wrote: > 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 Acked-by: Jean-Christophe PLAGNIOL-VILLARD Best Regards, J. > Cc: Tomi Valkeinen > Cc: linux-fbdev at vger.kernel.org > Signed-off-by: Laurent Pinchart > --- > drivers/video/sh_mobile_lcdcfb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c > index 0264704..eaeae0f 100644 > --- a/drivers/video/sh_mobile_lcdcfb.c > +++ b/drivers/video/sh_mobile_lcdcfb.c > @@ -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); > } > } > > -- > 1.8.1.5 >