diff options
author | Joe Perches <joe@perches.com> | 2014-09-13 14:31:15 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-15 22:09:41 -0400 |
commit | 75fd32b8ef68adf273c233b34c6b898780d290f2 (patch) | |
tree | ec1685f0a9dabbe71fada1e41e373d1cc931eadc /arch/arm/mach-imx | |
parent | bad3db104f8922df2c84fd7653cfbcbc93cd0cb7 (diff) |
arm: mach-imx: Convert pr_warning to pr_warn
Use the more common pr_warn.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/mach-armadillo5x0.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31lite.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm037.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index a7e9bd26a552..f2060523ba48 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c | |||
@@ -537,7 +537,7 @@ static void __init armadillo5x0_init(void) | |||
537 | gpio_free(ARMADILLO5X0_RTC_GPIO); | 537 | gpio_free(ARMADILLO5X0_RTC_GPIO); |
538 | } | 538 | } |
539 | if (armadillo5x0_i2c_rtc.irq == 0) | 539 | if (armadillo5x0_i2c_rtc.irq == 0) |
540 | pr_warning("armadillo5x0_init: failed to get RTC IRQ\n"); | 540 | pr_warn("armadillo5x0_init: failed to get RTC IRQ\n"); |
541 | i2c_register_board_info(1, &armadillo5x0_i2c_rtc, 1); | 541 | i2c_register_board_info(1, &armadillo5x0_i2c_rtc, 1); |
542 | 542 | ||
543 | /* USB */ | 543 | /* USB */ |
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 453f41a2c5a9..65a0dc06a97c 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c | |||
@@ -307,7 +307,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev, | |||
307 | ret = gpio_request_array(mx31_3ds_sdhc1_gpios, | 307 | ret = gpio_request_array(mx31_3ds_sdhc1_gpios, |
308 | ARRAY_SIZE(mx31_3ds_sdhc1_gpios)); | 308 | ARRAY_SIZE(mx31_3ds_sdhc1_gpios)); |
309 | if (ret) { | 309 | if (ret) { |
310 | pr_warning("Unable to request the SD/MMC GPIOs.\n"); | 310 | pr_warn("Unable to request the SD/MMC GPIOs.\n"); |
311 | return ret; | 311 | return ret; |
312 | } | 312 | } |
313 | 313 | ||
@@ -316,7 +316,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev, | |||
316 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, | 316 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, |
317 | "sdhc1-detect", data); | 317 | "sdhc1-detect", data); |
318 | if (ret) { | 318 | if (ret) { |
319 | pr_warning("Unable to request the SD/MMC card-detect IRQ.\n"); | 319 | pr_warn("Unable to request the SD/MMC card-detect IRQ.\n"); |
320 | goto gpio_free; | 320 | goto gpio_free; |
321 | } | 321 | } |
322 | 322 | ||
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index 57eac6f45fab..4822a1738de4 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c | |||
@@ -270,7 +270,7 @@ static void __init mx31lite_init(void) | |||
270 | /* SMSC9117 IRQ pin */ | 270 | /* SMSC9117 IRQ pin */ |
271 | ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq"); | 271 | ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_SFS6), "sms9117-irq"); |
272 | if (ret) | 272 | if (ret) |
273 | pr_warning("could not get LAN irq gpio\n"); | 273 | pr_warn("could not get LAN irq gpio\n"); |
274 | else { | 274 | else { |
275 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6)); | 275 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_SFS6)); |
276 | smsc911x_resources[1].start = | 276 | smsc911x_resources[1].start = |
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c index 8eb1570f7851..6d879417db49 100644 --- a/arch/arm/mach-imx/mach-pcm037.c +++ b/arch/arm/mach-imx/mach-pcm037.c | |||
@@ -58,7 +58,7 @@ static int __init pcm037_variant_setup(char *str) | |||
58 | if (!strcmp("eet", str)) | 58 | if (!strcmp("eet", str)) |
59 | pcm037_instance = PCM037_EET; | 59 | pcm037_instance = PCM037_EET; |
60 | else if (strcmp("pcm970", str)) | 60 | else if (strcmp("pcm970", str)) |
61 | pr_warning("Unknown pcm037 baseboard variant %s\n", str); | 61 | pr_warn("Unknown pcm037 baseboard variant %s\n", str); |
62 | 62 | ||
63 | return 1; | 63 | return 1; |
64 | } | 64 | } |
@@ -624,7 +624,7 @@ static void __init pcm037_init(void) | |||
624 | /* LAN9217 IRQ pin */ | 624 | /* LAN9217 IRQ pin */ |
625 | ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1), "lan9217-irq"); | 625 | ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1), "lan9217-irq"); |
626 | if (ret) | 626 | if (ret) |
627 | pr_warning("could not get LAN irq gpio\n"); | 627 | pr_warn("could not get LAN irq gpio\n"); |
628 | else { | 628 | else { |
629 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)); | 629 | gpio_direction_input(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)); |
630 | smsc911x_resources[1].start = | 630 | smsc911x_resources[1].start = |