From 87729899aa164d6f9a328a7b54b1fcdb27ef8478 Mon Sep 17 00:00:00 2001 From: Ulf Hansson Date: Thu, 12 Sep 2013 16:38:56 +0200 Subject: [PATCH] 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 Signed-off-by: Chris Ball --- drivers/mmc/core/sdio.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index a3c6a00a1773..0640de9333fa 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1196,17 +1196,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; /* -- 2.34.1