| Message ID | 20170117202601.3742-1-wsa@the-dreams.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Tue, Jan 17, 2017 at 9:26 PM, Wolfram Sang <wsa@the-dreams.de> wrote: > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Create a helper function to disable clocks and use it in remove(), too. > Now, clk_summary in debugfs reports the clocks as disabled and > unprepared after unbinding. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Wolfram, On Tuesday, January 17, 2017, Wolfram Sang wrote: > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Create a helper function to disable clocks and use it in remove(), too. > Now, clk_summary in debugfs reports the clocks as disabled and unprepared > after unbinding. Just tried it, now sh_mobile_sdhi_clk_disable() is called when unbinding. Thanks, Chris
On 17 January 2017 at 21:26, Wolfram Sang <wsa@the-dreams.de> wrote: > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Create a helper function to disable clocks and use it in remove(), too. > Now, clk_summary in debugfs reports the clocks as disabled and > unprepared after unbinding. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/tmio_mmc_pio.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > index ddba7b833f2c52..db3bde716b3eed 100644 > --- a/drivers/mmc/host/tmio_mmc_pio.c > +++ b/drivers/mmc/host/tmio_mmc_pio.c > @@ -947,6 +947,12 @@ static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) > return host->clk_enable(host); > } > > +static void tmio_mmc_clk_disable(struct tmio_mmc_host *host) > +{ > + if (host->clk_disable) > + host->clk_disable(host); > +} > + > static void tmio_mmc_power_on(struct tmio_mmc_host *host, unsigned short vdd) > { > struct mmc_host *mmc = host->mmc; > @@ -1332,6 +1338,8 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) > > pm_runtime_put_sync(&pdev->dev); > pm_runtime_disable(&pdev->dev); > + > + tmio_mmc_clk_disable(host); > } > EXPORT_SYMBOL(tmio_mmc_host_remove); > > @@ -1346,8 +1354,7 @@ int tmio_mmc_host_runtime_suspend(struct device *dev) > if (host->clk_cache) > tmio_mmc_clk_stop(host); > > - if (host->clk_disable) > - host->clk_disable(host); > + tmio_mmc_clk_disable(host); > > return 0; > } > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index ddba7b833f2c52..db3bde716b3eed 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -947,6 +947,12 @@ static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) return host->clk_enable(host); } +static void tmio_mmc_clk_disable(struct tmio_mmc_host *host) +{ + if (host->clk_disable) + host->clk_disable(host); +} + static void tmio_mmc_power_on(struct tmio_mmc_host *host, unsigned short vdd) { struct mmc_host *mmc = host->mmc; @@ -1332,6 +1338,8 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); + + tmio_mmc_clk_disable(host); } EXPORT_SYMBOL(tmio_mmc_host_remove); @@ -1346,8 +1354,7 @@ int tmio_mmc_host_runtime_suspend(struct device *dev) if (host->clk_cache) tmio_mmc_clk_stop(host); - if (host->clk_disable) - host->clk_disable(host); + tmio_mmc_clk_disable(host); return 0; }