Commit ec2ed700 authored Sep 12, 2013 by Ulf Hansson Committed by Chris Ball Oct 30, 2013

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>

parent 0f791fda

drivers/mmc/core/sdio.c

+3 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}

		card = host->card;

		/*