mmc: core: Restructure and simplify code for mmc sleep|awake

The mmc_card_sleep|awake APIs are not being used since the support is
already properly encapsulated within the suspend sequence. Sleep|awake
command is also specific for eMMC.

We remove the sleep|awake bus_ops, the mmc_card_sleep|awake APIs and
move the code into the mmc specific core instead. This also includes
the mmc ops function, mmc_sleepawake. All releated functions have then
become static and we have got far less code to maintain.

Additionally this patch also simplifies the code from mmc_sleepawake,
since it is only used to put the card to sleep and not awake.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 0 insertions, 46 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 0f86144b0c51..e9a104b9e4d3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2550,52 +2550,6 @@ int mmc_power_restore_host(struct mmc_host *host)
 }
 EXPORT_SYMBOL(mmc_power_restore_host);
 
-int mmc_card_awake(struct mmc_host *host)
-{
-        int err = -ENOSYS;
-
-        if (host->caps2 & MMC_CAP2_NO_SLEEP_CMD)
-                return 0;
-
-        mmc_bus_get(host);
-
-        if (host->bus_ops && !host->bus_dead && host->bus_ops->awake)
-                err = host->bus_ops->awake(host);
-
-        mmc_bus_put(host);
-
-        return err;
-}
-EXPORT_SYMBOL(mmc_card_awake);
-
-int mmc_card_sleep(struct mmc_host *host)
-{
-        int err = -ENOSYS;
-
-        if (host->caps2 & MMC_CAP2_NO_SLEEP_CMD)
-                return 0;
-
-        mmc_bus_get(host);
-
-        if (host->bus_ops && !host->bus_dead && host->bus_ops->sleep)
-                err = host->bus_ops->sleep(host);
-
-        mmc_bus_put(host);
-
-        return err;
-}
-EXPORT_SYMBOL(mmc_card_sleep);
-
-int mmc_card_can_sleep(struct mmc_host *host)
-{
-        struct mmc_card *card = host->card;
-
-        if (card && mmc_card_mmc(card) && card->ext_csd.rev >= 3)
-                return 1;
-        return 0;
-}
-EXPORT_SYMBOL(mmc_card_can_sleep);
-
 /*
  * Flush the cache to the non-volatile storage.
  */