Skip to content

Commit

Permalink
mmc: sdhci-msm: avoid unused function warning
Browse files Browse the repository at this point in the history
The newly added sdhci_msm_restore_sdr_dll_config() function is only called
if CONFIG_PM is enabled:

drivers/mmc/host/sdhci-msm.c:1050:12: error:
'sdhci_msm_restore_sdr_dll_config' defined but not used
[-Werror=unused-function]

Better remove the incorrect #ifdef altogether and just use __maybe_unused,
which is harder to get wrong.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Arnd Bergmann authored and Ulf Hansson committed Dec 17, 2018
1 parent 0e6e7c2 commit 6809a5f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/mmc/host/sdhci-msm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1997,8 +1997,7 @@ static int sdhci_msm_remove(struct platform_device *pdev)
return 0;
}

#ifdef CONFIG_PM
static int sdhci_msm_runtime_suspend(struct device *dev)
static __maybe_unused int sdhci_msm_runtime_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
Expand All @@ -2010,7 +2009,7 @@ static int sdhci_msm_runtime_suspend(struct device *dev)
return 0;
}

static int sdhci_msm_runtime_resume(struct device *dev)
static __maybe_unused int sdhci_msm_runtime_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
Expand All @@ -2030,7 +2029,6 @@ static int sdhci_msm_runtime_resume(struct device *dev)

return 0;
}
#endif

static const struct dev_pm_ops sdhci_msm_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
Expand Down

0 comments on commit 6809a5f

Please sign in to comment.