redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mmc: mediatek: mark PM functions as __maybe_unused 

The #ifdef check for the suspend/resume functions is wrong:

drivers/mmc/host/mtk-sd.c:2765:12: error: unused function 'msdc_suspend' [-Werror,-Wunused-function]
static int msdc_suspend(struct device *dev)
drivers/mmc/host/mtk-sd.c:2779:12: error: unused function 'msdc_resume' [-Werror,-Wunused-function]
static int msdc_resume(struct device *dev)

Remove the #ifdef and mark all four as __maybe_unused to aovid the
problem.

Fixes: c0a2074ac5 ("mmc: mediatek: Fix system suspend/resume support for CQHCI")
Cc: stable@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20201203222922.1067522-1-arnd@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
zero-sugar-mainline-defconfig
Arnd Bergmann 2020-12-03 23:29:16 +01:00 committed by Ulf Hansson
parent 6246d7c9d1
commit c0d638a03b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/host/mtk-sd.c
View File

@ -2604,7 +2604,6 @@ static int msdc_drv_remove(struct platform_device *pdev)
return 0;
}
#ifdef CONFIG_PM
static void msdc_save_reg(struct msdc_host *host)
{
u32 tune_reg = host->dev_comp->pad_tune_reg;
@ -2663,7 +2662,7 @@ static void msdc_restore_reg(struct msdc_host *host)
__msdc_enable_sdio_irq(host, 1);
}
static int msdc_runtime_suspend(struct device *dev)
static int __maybe_unused msdc_runtime_suspend(struct device *dev)
{
struct mmc_host *mmc = dev_get_drvdata(dev);
struct msdc_host *host = mmc_priv(mmc);
@ -2673,7 +2672,7 @@ static int msdc_runtime_suspend(struct device *dev)
return 0;
}
static int msdc_runtime_resume(struct device *dev)
static int __maybe_unused msdc_runtime_resume(struct device *dev)
{
struct mmc_host *mmc = dev_get_drvdata(dev);
struct msdc_host *host = mmc_priv(mmc);
@ -2683,7 +2682,7 @@ static int msdc_runtime_resume(struct device *dev)
return 0;
}
static int msdc_suspend(struct device *dev)
static int __maybe_unused msdc_suspend(struct device *dev)
{
struct mmc_host *mmc = dev_get_drvdata(dev);
int ret;
@ -2697,11 +2696,10 @@ static int msdc_suspend(struct device *dev)
return pm_runtime_force_suspend(dev);
}
static int msdc_resume(struct device *dev)
static int __maybe_unused msdc_resume(struct device *dev)
{
return pm_runtime_force_resume(dev);
}
#endif
static const struct dev_pm_ops msdc_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume)