Răsfoiți Sursa

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>
Ulf Hansson 12 ani în urmă
părinte
comite
ec2ed70062
1 a modificat fișierele cu 3 adăugiri și 11 ștergeri
  1. 3 11
      drivers/mmc/core/sdio.c

+ 3 - 11
drivers/mmc/core/sdio.c

@@ -1175,17 +1175,9 @@ int mmc_attach_sdio(struct mmc_host *host)
 		host->ocr |= R4_18V_PRESENT;
 		host->ocr |= R4_18V_PRESENT;
 
 
 	err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
 	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;
 	card = host->card;
 
 
 	/*
 	/*