From c53c6e7fac8c0583bdccbfde7c213ecc3da79854 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Sat, 7 Apr 2018 10:16:16 +0200 Subject: [PATCH] staging: mt7621-mmc: Fix power management by removing old api MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The mmc_suspend|resume_host functions have been decrepated in the 3.11 [1] release and were completely removed in 3.13 [2]. Removing the calls to this functions as it was done for other mmc host drivers before the old api was removed (eg. [3]) fixes compile errors in this driver while CONFIG_PM is enabled. The rest of the removed code is simply dead, the MSDC_SYS_SUSPEND flag is always set and will be removed in a later patch. [1] commit 986892ca78ee ("mmc: core: Initiate suspend|resume from mmc bus instead of mmc host") [2] commit 3c0d22e8180b ("mmc: core: Remove deprecated mmc_suspend|resume_host APIs") [3] commit 1e63d4854202 ("mmc: au1xmmc: Move away from using deprecated APIs") Signed-off-by: Christian Lütke-Stetzkamp Reviewed-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mt7621-mmc/sd.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c index 04f4832b..4cc4e81 100644 --- a/drivers/staging/mt7621-mmc/sd.c +++ b/drivers/staging/mt7621-mmc/sd.c @@ -858,13 +858,6 @@ static void msdc_pm(pm_message_t state, void *data) host->suspend = 1; host->pm_state = state; /* default PMSG_RESUME */ - INIT_MSG("%s Suspend", evt == PM_EVENT_SUSPEND ? "PM" : "USR"); - if (host->hw->flags & MSDC_SYS_SUSPEND) /* set for card */ { - (void)mmc_suspend_host(host->mmc); - } else { - // host->mmc->pm_flags |= MMC_PM_IGNORE_PM_NOTIFY; /* just for double confirm */ /* --- by chhung */ - mmc_remove_host(host->mmc); - } } else if (evt == PM_EVENT_RESUME || evt == PM_EVENT_USER_RESUME) { if (!host->suspend) { //ERR_MSG("warning: already resume"); @@ -880,13 +873,6 @@ static void msdc_pm(pm_message_t state, void *data) host->suspend = 0; host->pm_state = state; - INIT_MSG("%s Resume", evt == PM_EVENT_RESUME ? "PM" : "USR"); - if (host->hw->flags & MSDC_SYS_SUSPEND) { /* will not set for WIFI */ - (void)mmc_resume_host(host->mmc); - } else { - // host->mmc->pm_flags |= MMC_PM_IGNORE_PM_NOTIFY; /* --- by chhung */ - mmc_add_host(host->mmc); - } } } #endif -- 2.7.4