]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mmc: sdricoh_cs: Move away from using deprecated APIs
authorUlf Hansson <ulf.hansson@linaro.org>
Thu, 26 Sep 2013 08:02:56 +0000 (10:02 +0200)
committerChris Ball <cjb@laptop.org>
Thu, 31 Oct 2013 00:28:32 +0000 (20:28 -0400)
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>
drivers/mmc/host/sdricoh_cs.c

index 50adbd155f355bc00676fcc8d986b889f3c28040..b7e305775314fa75ccc58dd67752420bda8494ce 100644 (file)
@@ -516,9 +516,7 @@ static void sdricoh_pcmcia_detach(struct pcmcia_device *link)
 #ifdef CONFIG_PM
 static int sdricoh_pcmcia_suspend(struct pcmcia_device *link)
 {
-       struct mmc_host *mmc = link->priv;
        dev_dbg(&link->dev, "suspend\n");
-       mmc_suspend_host(mmc);
        return 0;
 }
 
@@ -527,7 +525,6 @@ static int sdricoh_pcmcia_resume(struct pcmcia_device *link)
        struct mmc_host *mmc = link->priv;
        dev_dbg(&link->dev, "resume\n");
        sdricoh_reset(mmc_priv(mmc));
-       mmc_resume_host(mmc);
        return 0;
 }
 #else