Commit 726d6f23 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: core: Collect common code for card ocr validation 



Since mmc_select_voltage now only gets called from the attach sequence,
it makes sense to move the out of spec validations of the card ocr into
this function.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent ce69d37b

drivers/mmc/core/core.c

+10 −0
Original line number Diff line number Diff line
@@ -1357,6 +1357,16 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) 
{

	int bit;



	/*

	 * Sanity check the voltages that the card claims to

	 * support.

	 */

	if (ocr & 0x7F) {

		dev_warn(mmc_dev(host),

		"card claims to support voltages below defined range\n");

		ocr &= ~0x7F;

	}



	ocr &= host->ocr_avail;

	if (!ocr) {

		dev_warn(mmc_dev(host), "no support for card's volts\n");

drivers/mmc/core/mmc.c

+0 −11
Original line number Diff line number Diff line
@@ -1666,17 +1666,6 @@ int mmc_attach_mmc(struct mmc_host *host) 
			goto err;

	}



	/*

	 * Sanity check the voltages that the card claims to

	 * support.

	 */

	if (ocr & 0x7F) {

		pr_warning("%s: card claims to support voltages "

		       "below the defined range. These will be ignored.\n",

		       mmc_hostname(host));

		ocr &= ~0x7F;

	}



	rocr = mmc_select_voltage(host, ocr);



	/*

drivers/mmc/core/sd.c

+0 −19
Original line number Diff line number Diff line
@@ -1231,25 +1231,6 @@ int mmc_attach_sd(struct mmc_host *host) 
			goto err;

	}



	/*

	 * Sanity check the voltages that the card claims to

	 * support.

	 */

	if (ocr & 0x7F) {

		pr_warning("%s: card claims to support voltages "

		       "below the defined range. These will be ignored.\n",

		       mmc_hostname(host));

		ocr &= ~0x7F;

	}



	if ((ocr & MMC_VDD_165_195) &&

	    !(host->ocr_avail_sd & MMC_VDD_165_195)) {

		pr_warning("%s: SD card claims to support the "

		       "incompletely defined 'low voltage range'. This "

		       "will be ignored.\n", mmc_hostname(host));

		ocr &= ~MMC_VDD_165_195;

	}



	rocr = mmc_select_voltage(host, ocr);



	/*

drivers/mmc/core/sdio.c

+0 −10
Original line number Diff line number Diff line
@@ -1133,16 +1133,6 @@ int mmc_attach_sdio(struct mmc_host *host) 
	if (host->ocr_avail_sdio)

		host->ocr_avail = host->ocr_avail_sdio;



	/*

	 * Sanity check the voltages that the card claims to

	 * support.

	 */

	if (ocr & 0x7F) {

		pr_warning("%s: card claims to support voltages "

		       "below the defined range. These will be ignored.\n",

		       mmc_hostname(host));

		ocr &= ~0x7F;

	}



	rocr = mmc_select_voltage(host, ocr);