mmc: cb710: 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: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c
index 9d6e2b844404d681bf5b5e61c22ccb026cf51181..1087b4c79cd661bbf8bfe57f73470e681324b668 100644 (file)
--- a/drivers/mmc/host/cb710-mmc.c
+++ b/drivers/mmc/host/cb710-mmc.c
@@ -667,12 +667,6 @@ static const struct mmc_host_ops cb710_mmc_host = {
 static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state)
 {
        struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
-       struct mmc_host *mmc = cb710_slot_to_mmc(slot);
-       int err;
-
-       err = mmc_suspend_host(mmc);
-       if (err)
-               return err;
 
        cb710_mmc_enable_irq(slot, 0, ~0);
        return 0;
@@ -681,11 +675,9 @@ static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state)
 static int cb710_mmc_resume(struct platform_device *pdev)
 {
        struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
-       struct mmc_host *mmc = cb710_slot_to_mmc(slot);
 
        cb710_mmc_enable_irq(slot, 0, ~0);
-
-       return mmc_resume_host(mmc);
+       return 0;
 }
 
 #endif /* CONFIG_PM */