mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

arm: mach-pxa: Convert pr_warning to pr_warn

Browse source 
Use the more common pr_warn.

Other miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
This commit is contained in:
Joe Perches 2014-09-13 11:31:18 -07:00 committed by Robert Jarzmik
parent f114040e3e
commit 7b472ac756
6 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-pxa/em-x270.c
View file

@ -378,7 +378,7 @@ static void __init em_x270_init_nand(void)
err = gpio_request(GPIO11_NAND_CS, "NAND CS"); err = gpio_request(GPIO11_NAND_CS, "NAND CS");
if (err) { if (err) {
pr_warning("EM-X270: failed to request NAND CS gpio\n"); pr_warn("EM-X270: failed to request NAND CS gpio\n");
return; return;
} }
@ -386,7 +386,7 @@ static void __init em_x270_init_nand(void)
err = gpio_request(nand_rb, "NAND R/B"); err = gpio_request(nand_rb, "NAND R/B");
if (err) { if (err) {
pr_warning("EM-X270: failed to request NAND R/B gpio\n"); pr_warn("EM-X270: failed to request NAND R/B gpio\n");
gpio_free(GPIO11_NAND_CS); gpio_free(GPIO11_NAND_CS);
return; return;
} }

3
arch/arm/mach-pxa/gumstix.c
View file

@ -140,8 +140,7 @@ static void gumstix_setup_bt_clock(void)
int timeout = 500; int timeout = 500;
if (!(OSCC & OSCC_OOK)) if (!(OSCC & OSCC_OOK))
pr_warning("32kHz clock was not on. Bootloader may need to " pr_warn("32kHz clock was not on. Bootloader may need to be updated\n");
"be updated\n");
else else
return; return;

12
arch/arm/mach-pxa/mfp-pxa2xx.c
View file

@ -93,8 +93,8 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)
break; break;
default: default:
/* warning and fall through, treat as MFP_LPM_DEFAULT */ /* warning and fall through, treat as MFP_LPM_DEFAULT */
pr_warning("%s: GPIO%d: unsupported low power mode\n", pr_warn("%s: GPIO%d: unsupported low power mode\n",
__func__, gpio); __func__, gpio);
break; break;
} }
@ -107,14 +107,12 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)
* configurations of those pins not able to wakeup * configurations of those pins not able to wakeup
*/ */
if ((c & MFP_LPM_CAN_WAKEUP) && !gpio_desc[gpio].can_wakeup) { if ((c & MFP_LPM_CAN_WAKEUP) && !gpio_desc[gpio].can_wakeup) {
pr_warning("%s: GPIO%d unable to wakeup\n", pr_warn("%s: GPIO%d unable to wakeup\n", __func__, gpio);
__func__, gpio);
return -EINVAL; return -EINVAL;
} }
if ((c & MFP_LPM_CAN_WAKEUP) && is_out) { if ((c & MFP_LPM_CAN_WAKEUP) && is_out) {
pr_warning("%s: output GPIO%d unable to wakeup\n", pr_warn("%s: output GPIO%d unable to wakeup\n", __func__, gpio);
__func__, gpio);
return -EINVAL; return -EINVAL;
} }
@ -126,7 +124,7 @@ static inline int __mfp_validate(int mfp)
int gpio = mfp_to_gpio(mfp); int gpio = mfp_to_gpio(mfp);
if ((mfp > MFP_PIN_GPIO127) || !gpio_desc[gpio].valid) { if ((mfp > MFP_PIN_GPIO127) || !gpio_desc[gpio].valid) {
pr_warning("%s: GPIO%d is invalid pin\n", __func__, gpio); pr_warn("%s: GPIO%d is invalid pin\n", __func__, gpio);
return -1; return -1;
} }

2
arch/arm/mach-pxa/poodle.c
View file

@ -446,7 +446,7 @@ static void __init poodle_init(void)
ret = platform_add_devices(devices, ARRAY_SIZE(devices)); ret = platform_add_devices(devices, ARRAY_SIZE(devices));
if (ret) if (ret)
pr_warning("poodle: Unable to register LoCoMo device\n"); pr_warn("poodle: Unable to register LoCoMo device\n");
pxa_set_fb_info(&poodle_locomo_device.dev, &poodle_fb_info); pxa_set_fb_info(&poodle_locomo_device.dev, &poodle_fb_info);
pxa_set_udc_info(&udc_info); pxa_set_udc_info(&udc_info);

6
arch/arm/mach-pxa/pxa3xx-ulpi.c
View file

@ -74,7 +74,7 @@ static int pxa310_ulpi_poll(void)
cpu_relax(); cpu_relax();
} }
pr_warning("%s: ULPI access timed out!\n", __func__); pr_warn("%s: ULPI access timed out!\n", __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -84,7 +84,7 @@ static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)
int err; int err;
if (pxa310_ulpi_get_phymode() != SYNCH) { if (pxa310_ulpi_get_phymode() != SYNCH) {
pr_warning("%s: PHY is not in SYNCH mode!\n", __func__); pr_warn("%s: PHY is not in SYNCH mode!\n", __func__);
return -EBUSY; return -EBUSY;
} }
@ -101,7 +101,7 @@ static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)
static int pxa310_ulpi_write(struct usb_phy *otg, u32 val, u32 reg) static int pxa310_ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
{ {
if (pxa310_ulpi_get_phymode() != SYNCH) { if (pxa310_ulpi_get_phymode() != SYNCH) {
pr_warning("%s: PHY is not in SYNCH mode!\n", __func__); pr_warn("%s: PHY is not in SYNCH mode!\n", __func__);
return -EBUSY; return -EBUSY;
} }

26
arch/arm/mach-pxa/raumfeld.c
View file

@ -521,7 +521,7 @@ static void __init raumfeld_w1_init(void)
"W1 external pullup enable"); "W1 external pullup enable");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_W1_PULLUP_ENABLE\n"); pr_warn("Unable to request GPIO_W1_PULLUP_ENABLE\n");
else else
gpio_direction_output(GPIO_W1_PULLUP_ENABLE, 0); gpio_direction_output(GPIO_W1_PULLUP_ENABLE, 0);
@ -600,7 +600,7 @@ static void __init raumfeld_lcd_init(void)
ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable"); ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_TFT_VA_EN\n"); pr_warn("Unable to request GPIO_TFT_VA_EN\n");
else else
gpio_direction_output(GPIO_TFT_VA_EN, 1); gpio_direction_output(GPIO_TFT_VA_EN, 1);
@ -608,7 +608,7 @@ static void __init raumfeld_lcd_init(void)
ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable"); ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_DISPLAY_ENABLE\n"); pr_warn("Unable to request GPIO_DISPLAY_ENABLE\n");
else else
gpio_direction_output(GPIO_DISPLAY_ENABLE, 1); gpio_direction_output(GPIO_DISPLAY_ENABLE, 1);
@ -814,17 +814,17 @@ static void __init raumfeld_power_init(void)
/* Set PEN2 high to enable maximum charge current */ /* Set PEN2 high to enable maximum charge current */
ret = gpio_request(GPIO_CHRG_PEN2, "CHRG_PEN2"); ret = gpio_request(GPIO_CHRG_PEN2, "CHRG_PEN2");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_CHRG_PEN2\n"); pr_warn("Unable to request GPIO_CHRG_PEN2\n");
else else
gpio_direction_output(GPIO_CHRG_PEN2, 1); gpio_direction_output(GPIO_CHRG_PEN2, 1);
ret = gpio_request(GPIO_CHARGE_DC_OK, "CABLE_DC_OK"); ret = gpio_request(GPIO_CHARGE_DC_OK, "CABLE_DC_OK");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_CHARGE_DC_OK\n"); pr_warn("Unable to request GPIO_CHARGE_DC_OK\n");
ret = gpio_request(GPIO_CHARGE_USB_SUSP, "CHARGE_USB_SUSP"); ret = gpio_request(GPIO_CHARGE_USB_SUSP, "CHARGE_USB_SUSP");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_CHARGE_USB_SUSP\n"); pr_warn("Unable to request GPIO_CHARGE_USB_SUSP\n");
else else
gpio_direction_output(GPIO_CHARGE_USB_SUSP, 0); gpio_direction_output(GPIO_CHARGE_USB_SUSP, 0);
@ -976,19 +976,19 @@ static void __init raumfeld_audio_init(void)
ret = gpio_request(GPIO_CODEC_RESET, "cs4270 reset"); ret = gpio_request(GPIO_CODEC_RESET, "cs4270 reset");
if (ret < 0) if (ret < 0)
pr_warning("unable to request GPIO_CODEC_RESET\n"); pr_warn("unable to request GPIO_CODEC_RESET\n");
else else
gpio_direction_output(GPIO_CODEC_RESET, 1); gpio_direction_output(GPIO_CODEC_RESET, 1);
ret = gpio_request(GPIO_SPDIF_RESET, "ak4104 s/pdif reset"); ret = gpio_request(GPIO_SPDIF_RESET, "ak4104 s/pdif reset");
if (ret < 0) if (ret < 0)
pr_warning("unable to request GPIO_SPDIF_RESET\n"); pr_warn("unable to request GPIO_SPDIF_RESET\n");
else else
gpio_direction_output(GPIO_SPDIF_RESET, 1); gpio_direction_output(GPIO_SPDIF_RESET, 1);
ret = gpio_request(GPIO_MCLK_RESET, "MCLK reset"); ret = gpio_request(GPIO_MCLK_RESET, "MCLK reset");
if (ret < 0) if (ret < 0)
pr_warning("unable to request GPIO_MCLK_RESET\n"); pr_warn("unable to request GPIO_MCLK_RESET\n");
else else
gpio_direction_output(GPIO_MCLK_RESET, 1); gpio_direction_output(GPIO_MCLK_RESET, 1);
@ -1019,20 +1019,20 @@ static void __init raumfeld_common_init(void)
ret = gpio_request(GPIO_W2W_RESET, "Wi2Wi reset"); ret = gpio_request(GPIO_W2W_RESET, "Wi2Wi reset");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_W2W_RESET\n"); pr_warn("Unable to request GPIO_W2W_RESET\n");
else else
gpio_direction_output(GPIO_W2W_RESET, 0); gpio_direction_output(GPIO_W2W_RESET, 0);
ret = gpio_request(GPIO_W2W_PDN, "Wi2Wi powerup"); ret = gpio_request(GPIO_W2W_PDN, "Wi2Wi powerup");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_W2W_PDN\n"); pr_warn("Unable to request GPIO_W2W_PDN\n");
else else
gpio_direction_output(GPIO_W2W_PDN, 0); gpio_direction_output(GPIO_W2W_PDN, 0);
/* this can be used to switch off the device */ /* this can be used to switch off the device */
ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown"); ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n"); pr_warn("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
else else
gpio_direction_output(GPIO_SHUTDOWN_SUPPLY, 0); gpio_direction_output(GPIO_SHUTDOWN_SUPPLY, 0);
@ -1051,7 +1051,7 @@ static void __init raumfeld_controller_init(void)
ret = gpio_request(GPIO_SHUTDOWN_BATT, "battery shutdown"); ret = gpio_request(GPIO_SHUTDOWN_BATT, "battery shutdown");
if (ret < 0) if (ret < 0)
pr_warning("Unable to request GPIO_SHUTDOWN_BATT\n"); pr_warn("Unable to request GPIO_SHUTDOWN_BATT\n");
else else
gpio_direction_output(GPIO_SHUTDOWN_BATT, 0); gpio_direction_output(GPIO_SHUTDOWN_BATT, 0);