diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-16 14:06:15 +0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-10-31 04:26:31 +0400 |
commit | 726d6f2374410d980341bfeb49399614e689e702 (patch) | |
tree | 5bf34c9ed06f802ef468a0af8cfb945ff0f7fe70 /drivers/mmc/core/sd.c | |
parent | ce69d37b7d8fa692c45d71d94aa0c921859b82ce (diff) | |
download | linux-726d6f2374410d980341bfeb49399614e689e702.tar.xz |
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/sd.c')
-rw-r--r-- | drivers/mmc/core/sd.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 53db60a76dae..6ef84d0ca178 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1231,25 +1231,6 @@ int mmc_attach_sd(struct mmc_host *host) goto err; } - /* - * Sanity check the voltages that the card claims to - * support. - */ - if (ocr & 0x7F) { - pr_warning("%s: card claims to support voltages " - "below the defined range. These will be ignored.\n", - mmc_hostname(host)); - ocr &= ~0x7F; - } - - if ((ocr & MMC_VDD_165_195) && - !(host->ocr_avail_sd & MMC_VDD_165_195)) { - pr_warning("%s: SD card claims to support the " - "incompletely defined 'low voltage range'. This " - "will be ignored.\n", mmc_hostname(host)); - ocr &= ~MMC_VDD_165_195; - } - rocr = mmc_select_voltage(host, ocr); /* |