| Message ID | 1368382358-4433-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, Lars-Peter Clausen <lars@metafoo.de> writes: > In preparation to switching the jz4740 clk driver to the common clk framework > update the clk enable/disable calls to clk_prepare_enable/clk_disable_unprepare. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > drivers/mmc/host/jz4740_mmc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c > index 2391c6b..2bc147f 100644 > --- a/drivers/mmc/host/jz4740_mmc.c > +++ b/drivers/mmc/host/jz4740_mmc.c > @@ -626,7 +626,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > gpio_set_value(host->pdata->gpio_power, > !host->pdata->power_active_low); > host->cmdat |= JZ_MMC_CMDAT_INIT; > - clk_enable(host->clk); > + clk_prepare_enable(host->clk); > break; > case MMC_POWER_ON: > break; > @@ -634,7 +634,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > if (gpio_is_valid(host->pdata->gpio_power)) > gpio_set_value(host->pdata->gpio_power, > host->pdata->power_active_low); > - clk_disable(host->clk); > + clk_disable_unprepare(host->clk); > break; > } Thanks, pushed to mmc-next for 3.11. - Chris.
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 2391c6b..2bc147f 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -626,7 +626,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) gpio_set_value(host->pdata->gpio_power, !host->pdata->power_active_low); host->cmdat |= JZ_MMC_CMDAT_INIT; - clk_enable(host->clk); + clk_prepare_enable(host->clk); break; case MMC_POWER_ON: break; @@ -634,7 +634,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (gpio_is_valid(host->pdata->gpio_power)) gpio_set_value(host->pdata->gpio_power, host->pdata->power_active_low); - clk_disable(host->clk); + clk_disable_unprepare(host->clk); break; }
In preparation to switching the jz4740 clk driver to the common clk framework update the clk enable/disable calls to clk_prepare_enable/clk_disable_unprepare. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- drivers/mmc/host/jz4740_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)