diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-10-20 13:23:16 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-19 04:53:54 +0100 |
| commit | 98adf932c0adc5e57257fe4230d89bda306a4037 (patch) | |
| tree | cb7cb4a3b19a07e9e032570edc73b144e3cd6f31 /arch/arm/mach-kirkwood/openrd-setup.c | |
| parent | ARM: Kirkwood: Fix sparse warnings. (diff) | |
| download | linux-98adf932c0adc5e57257fe4230d89bda306a4037.tar.xz linux-98adf932c0adc5e57257fe4230d89bda306a4037.zip | |
ARM: Kirkwood: checkpatch cleanups
Mostly printk to pr_{err|info} changes and a few strings split over
multiple lines are combined.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/openrd-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index 134ef50d58fc..7e81e9b586bf 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c @@ -121,14 +121,12 @@ static int __init uart1_mpp_config(void) kirkwood_mpp_conf(openrd_uart1_mpp_config); if (gpio_request(34, "SD_UART1_SEL")) { - printk(KERN_ERR "GPIO request failed for SD/UART1 selection" - ", gpio: 34\n"); + pr_err("GPIO request 34 failed for SD/UART1 selection\n"); return -EIO; } if (gpio_request(28, "RS232_RS485_SEL")) { - printk(KERN_ERR "GPIO request failed for RS232/RS485 selection" - ", gpio# 28\n"); + pr_err("GPIO request 28 failed for RS232/RS485 selection\n"); gpio_free(34); return -EIO; } @@ -185,15 +183,13 @@ static void __init openrd_init(void) if (uart1 <= 0) { if (uart1 < 0) - printk(KERN_ERR "Invalid kernel parameter to select " - "UART1. Defaulting to SD. ERROR CODE: %d\n", - uart1); + pr_err("Invalid kernel parameter to select UART1. Defaulting to SD. ERROR CODE: %d\n", + uart1); /* Select SD * Pin # 34: 0 => UART1, 1 => SD */ if (gpio_request(34, "SD_UART1_SEL")) { - printk(KERN_ERR "GPIO request failed for SD/UART1 " - "selection, gpio: 34\n"); + pr_err("GPIO request 34 failed for SD/UART1 selection\n"); } else { gpio_direction_output(34, 1); |