aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-26 04:02:56 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:28:32 -0400
commitb2822d372560dfffd730b974b73d77b210a71ffa (patch)
tree186d5a5005b4bbefef9e43b4ea7087ff5e7bba8a /drivers/mmc
parentff71c4bcb0af2730d047989e485303ae4e1ce794 (diff)
mmc: sdricoh_cs: 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. Cc: Sascha Sommer <saschasommer@freenet.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Sascha Sommer <saschasommer@freenet.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdricoh_cs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index 50adbd155f35..b7e305775314 100644
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -516,9 +516,7 @@ static void sdricoh_pcmcia_detach(struct pcmcia_device *link)
516#ifdef CONFIG_PM 516#ifdef CONFIG_PM
517static int sdricoh_pcmcia_suspend(struct pcmcia_device *link) 517static int sdricoh_pcmcia_suspend(struct pcmcia_device *link)
518{ 518{
519 struct mmc_host *mmc = link->priv;
520 dev_dbg(&link->dev, "suspend\n"); 519 dev_dbg(&link->dev, "suspend\n");
521 mmc_suspend_host(mmc);
522 return 0; 520 return 0;
523} 521}
524 522
@@ -527,7 +525,6 @@ static int sdricoh_pcmcia_resume(struct pcmcia_device *link)
527 struct mmc_host *mmc = link->priv; 525 struct mmc_host *mmc = link->priv;
528 dev_dbg(&link->dev, "resume\n"); 526 dev_dbg(&link->dev, "resume\n");
529 sdricoh_reset(mmc_priv(mmc)); 527 sdricoh_reset(mmc_priv(mmc));
530 mmc_resume_host(mmc);
531 return 0; 528 return 0;
532} 529}
533#else 530#else