On Mon, 28 Oct 2013, 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: Chris Ball <cjb@xxxxxxxxxx> > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@xxxxxxxxx> > Cc: linux-mmc@xxxxxxxxxxxxxxx > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx> Thanks Guennadi > --- > drivers/mmc/host/sh_mobile_sdhi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c > index f344659..ed1718a 100644 > --- a/drivers/mmc/host/sh_mobile_sdhi.c > +++ b/drivers/mmc/host/sh_mobile_sdhi.c > @@ -54,7 +54,7 @@ static int sh_mobile_sdhi_clk_enable(struct platform_device *pdev, unsigned int > struct mmc_host *mmc = platform_get_drvdata(pdev); > struct tmio_mmc_host *host = mmc_priv(mmc); > struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); > - int ret = clk_enable(priv->clk); > + int ret = clk_prepare_enable(priv->clk); > if (ret < 0) > return ret; > > @@ -67,7 +67,7 @@ static void sh_mobile_sdhi_clk_disable(struct platform_device *pdev) > struct mmc_host *mmc = platform_get_drvdata(pdev); > struct tmio_mmc_host *host = mmc_priv(mmc); > struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); > - clk_disable(priv->clk); > + clk_disable_unprepare(priv->clk); > } > > static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) > -- > 1.8.1.5 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
