Commit 4a09d0b8 authored Jan 19, 2018 by Arnd Bergmann Committed by Ulf Hansson Jan 22, 2018

mmc: tmio: hide unused tmio_mmc_clk_disable/tmio_mmc_clk_enable functions



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: b21fc294 ("mmc: tmio: move clk_enable/disable out of tmio_mmc_host_probe()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 2a9d6c80

drivers/mmc/host/tmio_mmc_core.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -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);

Admin message