renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 04:03:58 +08:00
Code

mmc: core: Collect common code for card ocr validation

Browse Source 
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: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Ulf Hansson 2013-09-16 12:06:15 +02:00 committed by Chris Ball
parent ce69d37b7d
commit 726d6f2374
4 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/core/core.c
View File

@ -1357,6 +1357,16 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
{ {
int bit; 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; ocr &= host->ocr_avail;
if (!ocr) { if (!ocr) {
dev_warn(mmc_dev(host), "no support for card's volts\n"); dev_warn(mmc_dev(host), "no support for card's volts\n");

11
drivers/mmc/core/mmc.c
View File

@ -1666,17 +1666,6 @@ int mmc_attach_mmc(struct mmc_host *host)
goto err; 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); rocr = mmc_select_voltage(host, ocr);
/* /*

19
drivers/mmc/core/sd.c
View File

@ -1231,25 +1231,6 @@ int mmc_attach_sd(struct mmc_host *host)
goto err; 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); rocr = mmc_select_voltage(host, ocr);
/* /*

10
drivers/mmc/core/sdio.c
View File

@ -1133,16 +1133,6 @@ int mmc_attach_sdio(struct mmc_host *host)
if (host->ocr_avail_sdio) if (host->ocr_avail_sdio)
host->ocr_avail = 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); rocr = mmc_select_voltage(host, ocr);