diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-16 06:06:15 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:26:31 -0400 |
commit | 726d6f2374410d980341bfeb49399614e689e702 (patch) | |
tree | 5bf34c9ed06f802ef468a0af8cfb945ff0f7fe70 /drivers/mmc/core/sdio.c | |
parent | ce69d37b7d8fa692c45d71d94aa0c921859b82ce (diff) |
mmc: core: Collect common code for card ocr validation
Since mmc_select_voltage now only gets called from the attach sequence,
it makes sense to move the out of spec validations of the card ocr into
this function.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/sdio.c')
-rw-r--r-- | drivers/mmc/core/sdio.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index b7c19e894dd3..4d721c6e2af0 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c | |||
@@ -1133,16 +1133,6 @@ int mmc_attach_sdio(struct mmc_host *host) | |||
1133 | if (host->ocr_avail_sdio) | 1133 | if (host->ocr_avail_sdio) |
1134 | host->ocr_avail = host->ocr_avail_sdio; | 1134 | host->ocr_avail = host->ocr_avail_sdio; |
1135 | 1135 | ||
1136 | /* | ||
1137 | * Sanity check the voltages that the card claims to | ||
1138 | * support. | ||
1139 | */ | ||
1140 | if (ocr & 0x7F) { | ||
1141 | pr_warning("%s: card claims to support voltages " | ||
1142 | "below the defined range. These will be ignored.\n", | ||
1143 | mmc_hostname(host)); | ||
1144 | ocr &= ~0x7F; | ||
1145 | } | ||
1146 | 1136 | ||
1147 | rocr = mmc_select_voltage(host, ocr); | 1137 | rocr = mmc_select_voltage(host, ocr); |
1148 | 1138 | ||