mmc: core: Remove unnecessary retry mechanism at SDIO attach

The retry and fallback mechanism when failing to switch to 1.8V
signaling voltage is handled by the SDIO card init function. Thus we
can remove the duplicated old code from the attach function.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 15cbc418c95fe2a9d82721d1dad2723879c0e7e0..26b13169156cb119cd36ba9926497e3c52c194ba 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -1175,17 +1175,9 @@ int mmc_attach_sdio(struct mmc_host *host)
                host->ocr |= R4_18V_PRESENT;
 
        err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
-       if (err) {
-               if (err == -EAGAIN) {
-                       /*
-                        * Retry initialization with S18R set to 0.
-                        */
-                       host->ocr &= ~R4_18V_PRESENT;
-                       err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
-               }
-               if (err)
-                       goto err;
-       }
+       if (err)
+               goto err;
+
        card = host->card;
 
        /*