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>

4 files changed, 10 insertions, 40 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 63672aba0e98..bcb507771eeb 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1357,6 +1357,16 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
 {
         int bit;
 
+        /*
+         * Sanity check the voltages that the card claims to
+         * support.
+         */
+        if (ocr & 0x7F) {
+                dev_warn(mmc_dev(host),
+                "card claims to support voltages below defined range\n");
+                ocr &= ~0x7F;
+        }
+
         ocr &= host->ocr_avail;
         if (!ocr) {
                 dev_warn(mmc_dev(host), "no support for card's volts\n");
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 18ce81a85c9b..0d060227cfc1 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1666,17 +1666,6 @@ int mmc_attach_mmc(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;
-        }
-
         rocr = mmc_select_voltage(host, ocr);
 
         /*
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);
 
         /*
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)
         if (host->ocr_avail_sdio)
                 host->ocr_avail = host->ocr_avail_sdio;
 
-        /*
-         * 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;
-        }
 
         rocr = mmc_select_voltage(host, ocr);