diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-12 16:38:56 +0200 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2013-10-30 20:26:27 -0400 |
| commit | ec2ed7006263bd4224083aff7833bd791ac35d65 (patch) | |
| tree | 9c1eb6324965a9db8452c64a684fd41a1a6b5f21 /drivers/mmc | |
| parent | mmc: core: Let mmc_set_signal_voltage take ocr as parameter (diff) | |
| download | linux-dev-ec2ed7006263bd4224083aff7833bd791ac35d65.tar.xz linux-dev-ec2ed7006263bd4224083aff7833bd791ac35d65.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/sdio.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 15cbc418c95f..26b13169156c 100644 --- 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; /* |