Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: msm_sdcc: Move away from using deprecated APIs

Suspend and resume of cards are being handled from the protocol layer
and consequently the mmc_suspend|resume_host APIs are deprecated.

This means we can simplify the suspend|resume callbacks by removing the
use of the deprecated APIs.

Additionally, remove dead code which also used the deprecated APIs.

Cc: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: linux-arm-msm@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

authored by

Ulf Hansson and committed by
Chris Ball
29685f6c c91c413e

+2 -25
+2 -25
drivers/mmc/host/msm_sdcc.c
··· 1416 1416 } 1417 1417 1418 1418 #ifdef CONFIG_PM 1419 - #ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ 1420 - static void 1421 - do_resume_work(struct work_struct *work) 1422 - { 1423 - struct msmsdcc_host *host = 1424 - container_of(work, struct msmsdcc_host, resume_task); 1425 - struct mmc_host *mmc = host->mmc; 1426 - 1427 - if (mmc) { 1428 - mmc_resume_host(mmc); 1429 - if (host->stat_irq) 1430 - enable_irq(host->stat_irq); 1431 - } 1432 - } 1433 - #endif 1434 - 1435 - 1436 1419 static int 1437 1420 msmsdcc_suspend(struct platform_device *dev, pm_message_t state) 1438 1421 { 1439 1422 struct mmc_host *mmc = mmc_get_drvdata(dev); 1440 - int rc = 0; 1441 1423 1442 1424 if (mmc) { 1443 1425 struct msmsdcc_host *host = mmc_priv(mmc); ··· 1427 1445 if (host->stat_irq) 1428 1446 disable_irq(host->stat_irq); 1429 1447 1430 - if (mmc->card && mmc->card->type != MMC_TYPE_SDIO) 1431 - rc = mmc_suspend_host(mmc); 1432 - if (!rc) 1433 - msmsdcc_writel(host, 0, MMCIMASK0); 1448 + msmsdcc_writel(host, 0, MMCIMASK0); 1434 1449 if (host->clks_on) 1435 1450 msmsdcc_disable_clocks(host, 0); 1436 1451 } 1437 - return rc; 1452 + return 0; 1438 1453 } 1439 1454 1440 1455 static int ··· 1446 1467 1447 1468 msmsdcc_writel(host, host->saved_irq0mask, MMCIMASK0); 1448 1469 1449 - if (mmc->card && mmc->card->type != MMC_TYPE_SDIO) 1450 - mmc_resume_host(mmc); 1451 1470 if (host->stat_irq) 1452 1471 enable_irq(host->stat_irq); 1453 1472 #if BUSCLK_PWRSAVE