staging: mt7621-mmc: Fix power management by removing old api
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] commit986892ca78
("mmc: core: Initiate suspend|resume from mmc bus instead of mmc host") [2] commit3c0d22e818
("mmc: core: Remove deprecated mmc_suspend|resume_host APIs") [3] commit1e63d48542
("mmc: au1xmmc: Move away from using deprecated APIs") Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de> Reviewed-by: NeilBrown <neil@brown.name> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bfd9337061
commit
c53c6e7fac
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue