Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b472ac7 authored by Joe Perches's avatar Joe Perches Committed by Robert Jarzmik
Browse files

arm: mach-pxa: Convert pr_warning to pr_warn 



Use the more common pr_warn.

Other miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent f114040e

arch/arm/mach-pxa/em-x270.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static void __init em_x270_init_nand(void) 


	err = gpio_request(GPIO11_NAND_CS, "NAND CS");

	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;

	}
@@ -386,7 +386,7 @@ static void __init em_x270_init_nand(void) 


	err = gpio_request(nand_rb, "NAND R/B");

	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);

		return;

	}

arch/arm/mach-pxa/gumstix.c

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ static void gumstix_setup_bt_clock(void) 
	int timeout = 500;



	if (!(OSCC & OSCC_OOK))

		pr_warning("32kHz clock was not on. Bootloader may need to "

				"be updated\n");

		pr_warn("32kHz clock was not on. Bootloader may need to be updated\n");

	else

		return;

arch/arm/mach-pxa/mfp-pxa2xx.c

+5 −7
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) 
		break;

	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);

		break;

	}
@@ -107,14 +107,12 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) 
	 * configurations of those pins not able to wakeup

	 */

	if ((c & MFP_LPM_CAN_WAKEUP) && !gpio_desc[gpio].can_wakeup) {

		pr_warning("%s: GPIO%d unable to wakeup\n",

				__func__, gpio);

		pr_warn("%s: GPIO%d unable to wakeup\n", __func__, gpio);

		return -EINVAL;

	}



	if ((c & MFP_LPM_CAN_WAKEUP) && is_out) {

		pr_warning("%s: output GPIO%d unable to wakeup\n",

				__func__, gpio);

		pr_warn("%s: output GPIO%d unable to wakeup\n", __func__, gpio);

		return -EINVAL;

	}
@@ -126,7 +124,7 @@ static inline int __mfp_validate(int mfp) 
	int gpio = mfp_to_gpio(mfp);



	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;

	}

arch/arm/mach-pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static void __init poodle_init(void) 


	ret = platform_add_devices(devices, ARRAY_SIZE(devices));

	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_udc_info(&udc_info);

arch/arm/mach-pxa/pxa3xx-ulpi.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int pxa310_ulpi_poll(void) 
		cpu_relax();

	}



	pr_warning("%s: ULPI access timed out!\n", __func__);

	pr_warn("%s: ULPI access timed out!\n", __func__);



	return -ETIMEDOUT;

}
@@ -84,7 +84,7 @@ static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg) 
	int err;



	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;

	}
@@ -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)

{

	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;

	}