diff options
author | Joe Perches <joe@perches.com> | 2014-09-12 17:56:56 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-24 04:13:09 -0400 |
commit | 6606110d89aefcb21b9e70adfe064987cbd8393a (patch) | |
tree | 599b064df3762b1da4d28f4e6ec9df0afcfacdd5 /drivers/mmc/core/sdio.c | |
parent | 48d11e067fc90ec9fc9c8f7ab982e5a83bf1887b (diff) |
mmc: Convert pr_warning to pr_warn
Use the much more common pr_warn instead of pr_warning.
Other miscellanea:
o Coalesce formats
o Realign arguments
o Remove extra spaces when coalescing formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core/sdio.c')
-rw-r--r-- | drivers/mmc/core/sdio.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 3fc40a7140a8..2439e717655b 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c | |||
@@ -216,8 +216,8 @@ static int sdio_enable_wide(struct mmc_card *card) | |||
216 | return ret; | 216 | return ret; |
217 | 217 | ||
218 | if ((ctrl & SDIO_BUS_WIDTH_MASK) == SDIO_BUS_WIDTH_RESERVED) | 218 | if ((ctrl & SDIO_BUS_WIDTH_MASK) == SDIO_BUS_WIDTH_RESERVED) |
219 | pr_warning("%s: SDIO_CCCR_IF is invalid: 0x%02x\n", | 219 | pr_warn("%s: SDIO_CCCR_IF is invalid: 0x%02x\n", |
220 | mmc_hostname(card->host), ctrl); | 220 | mmc_hostname(card->host), ctrl); |
221 | 221 | ||
222 | /* set as 4-bit bus width */ | 222 | /* set as 4-bit bus width */ |
223 | ctrl &= ~SDIO_BUS_WIDTH_MASK; | 223 | ctrl &= ~SDIO_BUS_WIDTH_MASK; |
@@ -605,8 +605,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, | |||
605 | 605 | ||
606 | try_again: | 606 | try_again: |
607 | if (!retries) { | 607 | if (!retries) { |
608 | pr_warning("%s: Skipping voltage switch\n", | 608 | pr_warn("%s: Skipping voltage switch\n", mmc_hostname(host)); |
609 | mmc_hostname(host)); | ||
610 | ocr &= ~R4_18V_PRESENT; | 609 | ocr &= ~R4_18V_PRESENT; |
611 | } | 610 | } |
612 | 611 | ||