Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29685f6c authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent c91c413e

drivers/mmc/host/msm_sdcc.c

+2 −25
Original line number Diff line number Diff line
@@ -1416,28 +1416,10 @@ msmsdcc_probe(struct platform_device *pdev) 
}



#ifdef CONFIG_PM

#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ

static void

do_resume_work(struct work_struct *work)

{

	struct msmsdcc_host *host =

		container_of(work, struct msmsdcc_host, resume_task);

	struct mmc_host	*mmc = host->mmc;



	if (mmc) {

		mmc_resume_host(mmc);

		if (host->stat_irq)

			enable_irq(host->stat_irq);

	}

}

#endif





static int

msmsdcc_suspend(struct platform_device *dev, pm_message_t state)

{

	struct mmc_host *mmc = mmc_get_drvdata(dev);

	int rc = 0;



	if (mmc) {

		struct msmsdcc_host *host = mmc_priv(mmc);
@@ -1445,14 +1427,11 @@ msmsdcc_suspend(struct platform_device *dev, pm_message_t state) 
		if (host->stat_irq)

			disable_irq(host->stat_irq);



		if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)

			rc = mmc_suspend_host(mmc);

		if (!rc)

		msmsdcc_writel(host, 0, MMCIMASK0);

		if (host->clks_on)

			msmsdcc_disable_clocks(host, 0);

	}

	return rc;

	return 0;

}



static int
@@ -1467,8 +1446,6 @@ msmsdcc_resume(struct platform_device *dev) 


		msmsdcc_writel(host, host->saved_irq0mask, MMCIMASK0);



		if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)

			mmc_resume_host(mmc);

		if (host->stat_irq)

			enable_irq(host->stat_irq);

#if BUSCLK_PWRSAVE