mmc: wbsd: 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: Pierre Ossman <pierre@ossman.eu>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 5 insertions, 28 deletions

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index e954b7758876..024c82414996 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1814,28 +1814,11 @@ static void wbsd_pnp_remove(struct pnp_dev *dev)
 
 #ifdef CONFIG_PM
 
-static int wbsd_suspend(struct wbsd_host *host, pm_message_t state)
-{
-        BUG_ON(host == NULL);
-
-        return mmc_suspend_host(host->mmc);
-}
-
-static int wbsd_resume(struct wbsd_host *host)
-{
-        BUG_ON(host == NULL);
-
-        wbsd_init_device(host);
-
-        return mmc_resume_host(host->mmc);
-}
-
 static int wbsd_platform_suspend(struct platform_device *dev,
                                  pm_message_t state)
 {
         struct mmc_host *mmc = platform_get_drvdata(dev);
         struct wbsd_host *host;
-        int ret;
 
         if (mmc == NULL)
                 return 0;
@@ -1844,12 +1827,7 @@ static int wbsd_platform_suspend(struct platform_device *dev,
 
         host = mmc_priv(mmc);
 
-        ret = wbsd_suspend(host, state);
-        if (ret)
-                return ret;
-
         wbsd_chip_poweroff(host);
-
         return 0;
 }
 
@@ -1872,7 +1850,8 @@ static int wbsd_platform_resume(struct platform_device *dev)
          */
         mdelay(5);
 
-        return wbsd_resume(host);
+        wbsd_init_device(host);
+        return 0;
 }
 
 #ifdef CONFIG_PNP
@@ -1886,10 +1865,7 @@ static int wbsd_pnp_suspend(struct pnp_dev *pnp_dev, pm_message_t state)
                 return 0;
 
         DBGF("Suspending...\n");
-
-        host = mmc_priv(mmc);
-
-        return wbsd_suspend(host, state);
+        return 0;
 }
 
 static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
@@ -1922,7 +1898,8 @@ static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
          */
         mdelay(5);
 
-        return wbsd_resume(host);
+        wbsd_init_device(host);
+        return 0;
 }
 
 #endif /* CONFIG_PNP */