Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: msm_sdcc: Move away from using deprecated APIs

Browse source 
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>
This commit is contained in:
Ulf Hansson 2013-09-25 13:29:28 +02:00 committed by Chris Ball
parent c91c413e47
commit 29685f6c6a
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/mmc/host/msm_sdcc.c
View file

@ -1416,28 +1416,10 @@ msmsdcc_probe(struct platform_device *pdev)
} }
#ifdef CONFIG_PM #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 static int
msmsdcc_suspend(struct platform_device *dev, pm_message_t state) msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
{ {
struct mmc_host *mmc = mmc_get_drvdata(dev); struct mmc_host *mmc = mmc_get_drvdata(dev);
int rc = 0;
if (mmc) { if (mmc) {
struct msmsdcc_host *host = mmc_priv(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) if (host->stat_irq)
disable_irq(host->stat_irq); disable_irq(host->stat_irq);
if (mmc->card && mmc->card->type != MMC_TYPE_SDIO) msmsdcc_writel(host, 0, MMCIMASK0);
rc = mmc_suspend_host(mmc);
if (!rc)
msmsdcc_writel(host, 0, MMCIMASK0);
if (host->clks_on) if (host->clks_on)
msmsdcc_disable_clocks(host, 0); msmsdcc_disable_clocks(host, 0);
} }
return rc; return 0;
} }
static int static int
@ -1467,8 +1446,6 @@ msmsdcc_resume(struct platform_device *dev)
msmsdcc_writel(host, host->saved_irq0mask, MMCIMASK0); msmsdcc_writel(host, host->saved_irq0mask, MMCIMASK0);
if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
mmc_resume_host(mmc);
if (host->stat_irq) if (host->stat_irq)
enable_irq(host->stat_irq); enable_irq(host->stat_irq);
#if BUSCLK_PWRSAVE #if BUSCLK_PWRSAVE