| Message ID | 20180119145502.1114288-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2018-01-19 23:54 GMT+09:00 Arnd Bergmann <arnd@arndb.de>: > When CONFIG_PM is disabled, we get a warning about the clock handling > being unused: > > drivers/mmc/host/tmio_mmc_core.c:937:13: error: 'tmio_mmc_clk_disable' defined but not used [-Werror=unused-function] > static void tmio_mmc_clk_disable(struct tmio_mmc_host *host) > ^~~~~~~~~~~~~~~~~~~~ > drivers/mmc/host/tmio_mmc_core.c:929:12: error: 'tmio_mmc_clk_enable' defined but not used [-Werror=unused-function] > static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) > ^~~~~~~~~~~~~~~~~~~ > > As the clock handling is now done elsewhere, this is only used when > power management is enabled. We could make the functions as __maybe_unused, > but since there is already an #ifdef section, it seems easier to move > the helpers closer to their callers. > > Fixes: b21fc294387e ("mmc: tmio: move clk_enable/disable out of tmio_mmc_host_probe()") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- Good catch, thanks! Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
On 19 January 2018 at 15:54, Arnd Bergmann <arnd@arndb.de> wrote: > When CONFIG_PM is disabled, we get a warning about the clock handling > being unused: > > drivers/mmc/host/tmio_mmc_core.c:937:13: error: 'tmio_mmc_clk_disable' defined but not used [-Werror=unused-function] > static void tmio_mmc_clk_disable(struct tmio_mmc_host *host) > ^~~~~~~~~~~~~~~~~~~~ > drivers/mmc/host/tmio_mmc_core.c:929:12: error: 'tmio_mmc_clk_enable' defined but not used [-Werror=unused-function] > static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) > ^~~~~~~~~~~~~~~~~~~ > > As the clock handling is now done elsewhere, this is only used when > power management is enabled. We could make the functions as __maybe_unused, > but since there is already an #ifdef section, it seems easier to move > the helpers closer to their callers. > > Fixes: b21fc294387e ("mmc: tmio: move clk_enable/disable out of tmio_mmc_host_probe()") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/tmio_mmc_core.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c > index 6d8719be75a8..33494241245a 100644 > --- a/drivers/mmc/host/tmio_mmc_core.c > +++ b/drivers/mmc/host/tmio_mmc_core.c > @@ -926,20 +926,6 @@ static void tmio_mmc_done_work(struct work_struct *work) > tmio_mmc_finish_request(host); > } > > -static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) > -{ > - if (!host->clk_enable) > - return -ENOTSUPP; > - > - 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; > @@ -1337,6 +1323,20 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) > EXPORT_SYMBOL_GPL(tmio_mmc_host_remove); > > #ifdef CONFIG_PM > +static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) > +{ > + if (!host->clk_enable) > + return -ENOTSUPP; > + > + return host->clk_enable(host); > +} > + > +static void tmio_mmc_clk_disable(struct tmio_mmc_host *host) > +{ > + if (host->clk_disable) > + host->clk_disable(host); > +} > + > int tmio_mmc_host_runtime_suspend(struct device *dev) > { > struct tmio_mmc_host *host = dev_get_drvdata(dev); > -- > 2.9.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_core.c b/drivers/mmc/host/tmio_mmc_core.c index 6d8719be75a8..33494241245a 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -926,20 +926,6 @@ static void tmio_mmc_done_work(struct work_struct *work) tmio_mmc_finish_request(host); } -static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) -{ - if (!host->clk_enable) - return -ENOTSUPP; - - 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; @@ -1337,6 +1323,20 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) EXPORT_SYMBOL_GPL(tmio_mmc_host_remove); #ifdef CONFIG_PM +static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) +{ + if (!host->clk_enable) + return -ENOTSUPP; + + return host->clk_enable(host); +} + +static void tmio_mmc_clk_disable(struct tmio_mmc_host *host) +{ + if (host->clk_disable) + host->clk_disable(host); +} + int tmio_mmc_host_runtime_suspend(struct device *dev) { struct tmio_mmc_host *host = dev_get_drvdata(dev);
When CONFIG_PM is disabled, we get a warning about the clock handling being unused: drivers/mmc/host/tmio_mmc_core.c:937:13: error: 'tmio_mmc_clk_disable' defined but not used [-Werror=unused-function] static void tmio_mmc_clk_disable(struct tmio_mmc_host *host) ^~~~~~~~~~~~~~~~~~~~ drivers/mmc/host/tmio_mmc_core.c:929:12: error: 'tmio_mmc_clk_enable' defined but not used [-Werror=unused-function] static int tmio_mmc_clk_enable(struct tmio_mmc_host *host) ^~~~~~~~~~~~~~~~~~~ As the clock handling is now done elsewhere, this is only used when power management is enabled. We could make the functions as __maybe_unused, but since there is already an #ifdef section, it seems easier to move the helpers closer to their callers. Fixes: b21fc294387e ("mmc: tmio: move clk_enable/disable out of tmio_mmc_host_probe()") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/mmc/host/tmio_mmc_core.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)