mmc: core: Remove support for MMC_CAP2_NO_SLEEP_CMD

There are no active users of this host capability. The primary reason
for adding this cap was due to a bug in ux500 boot loader code, which
is not a relevant issue any more. So, let's remove it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 20f0468952287cc18a33dc5080d7c680101539e2..5c4ee6ab212552479acaf679b55746db96e253b2 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1358,9 +1358,6 @@ static int mmc_sleep(struct mmc_host *host)
        struct mmc_card *card = host->card;
        int err;
 
-       if (host->caps2 & MMC_CAP2_NO_SLEEP_CMD)
-               return 0;
-
        err = mmc_deselect_cards(host);
        if (err)
                return err;

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 461c69f19425f76165303ef3be96cf2f10cd4a7a..4c0176a8e47484deb7c0bcb1fd8c52b78efd9069 100644 (file)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -267,7 +267,6 @@ struct mmc_host {
 #define MMC_CAP2_CACHE_CTRL    (1 << 1)        /* Allow cache control */
 #define MMC_CAP2_FULL_PWR_CYCLE        (1 << 2)        /* Can do full power cycle */
 #define MMC_CAP2_NO_MULTI_READ (1 << 3)        /* Multiblock reads don't work */
-#define MMC_CAP2_NO_SLEEP_CMD  (1 << 4)        /* Don't allow sleep command */
 #define MMC_CAP2_HS200_1_8V_SDR        (1 << 5)        /* can support */
 #define MMC_CAP2_HS200_1_2V_SDR        (1 << 6)        /* can support */
 #define MMC_CAP2_HS200         (MMC_CAP2_HS200_1_8V_SDR | \