Message ID | e677b5b8e17c2349d624e949722f4ab1a5e1698c.1352387305.git.viresh.kumar@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On Thu, Nov 08 2012, Viresh Kumar wrote: > clk_{un}prepare is mandatory for platforms using common clock framework. Because > for SPEAr we don't do anything in clk_{un}prepare() calls, just call them ones > in probe/remove. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > drivers/mmc/host/sdhci-spear.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c > index fea8bf9..87a7009 100644 > --- a/drivers/mmc/host/sdhci-spear.c > +++ b/drivers/mmc/host/sdhci-spear.c > @@ -302,7 +302,7 @@ static int sdhci_suspend(struct device *dev) > > ret = sdhci_suspend_host(host); > if (!ret) > - clk_disable_unprepare(sdhci->clk); > + clk_disable(sdhci->clk); > > return ret; > } > @@ -313,7 +313,7 @@ static int sdhci_resume(struct device *dev) > struct spear_sdhci *sdhci = dev_get_platdata(dev); > int ret; > > - ret = clk_prepare_enable(sdhci->clk); > + ret = clk_enable(sdhci->clk); > if (ret) { > dev_dbg(dev, "Resume: Error enabling clock\n"); > return ret; Thanks, pushed to mmc-next for 3.8. - Chris.
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c index fea8bf9..87a7009 100644 --- a/drivers/mmc/host/sdhci-spear.c +++ b/drivers/mmc/host/sdhci-spear.c @@ -302,7 +302,7 @@ static int sdhci_suspend(struct device *dev) ret = sdhci_suspend_host(host); if (!ret) - clk_disable_unprepare(sdhci->clk); + clk_disable(sdhci->clk); return ret; } @@ -313,7 +313,7 @@ static int sdhci_resume(struct device *dev) struct spear_sdhci *sdhci = dev_get_platdata(dev); int ret; - ret = clk_prepare_enable(sdhci->clk); + ret = clk_enable(sdhci->clk); if (ret) { dev_dbg(dev, "Resume: Error enabling clock\n"); return ret;
clk_{un}prepare is mandatory for platforms using common clock framework. Because for SPEAr we don't do anything in clk_{un}prepare() calls, just call them ones in probe/remove. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/mmc/host/sdhci-spear.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)