Commit ec2ed700 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 0f791fda
...@@ -1175,17 +1175,9 @@ int mmc_attach_sdio(struct mmc_host *host) ...@@ -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)
if (err == -EAGAIN) { goto err;
/*
* 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;
}
card = host->card; card = host->card;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment