summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-12-16 14:46:00 +0100
committerChris Ball <chris@printf.net>2014-02-13 22:58:37 -0500
commit469a00b017a9b2c630bff962ffd64ba626977830 (patch)
tree5da04f231d5e6d6c4dd693773e4637011d546446
parent325e2f96b926ae852fa2aa5e64d1040ed9518ae1 (diff)
downloadblackbird-op-linux-469a00b017a9b2c630bff962ffd64ba626977830.tar.gz
blackbird-op-linux-469a00b017a9b2c630bff962ffd64ba626977830.zip
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>
-rw-r--r--drivers/mmc/core/mmc.c3
-rw-r--r--include/linux/mmc/host.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 20f046895228..5c4ee6ab2125 100644
--- 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 461c69f19425..4c0176a8e474 100644
--- 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 | \
OpenPOWER on IntegriCloud