hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andrew Lunn 2012-10-20 13:23:16 +02:00 committed by Jason Cooper
parent d1c925b221
commit 98adf932c0
11 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-kirkwood/board-dt.c
View File

@ -98,7 +98,7 @@ static void __init kirkwood_dt_init(void)
kirkwood_auxdata_lookup, NULL); kirkwood_auxdata_lookup, NULL);
} }
static const char *kirkwood_dt_board_compat[] = { static const char * const kirkwood_dt_board_compat[] = {
"globalscale,dreamplug", "globalscale,dreamplug",
"dlink,dns-320", "dlink,dns-320",
"dlink,dns-325", "dlink,dns-325",

9
arch/arm/mach-kirkwood/common.c
View File

@ -18,10 +18,10 @@
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/mv643xx_i2c.h> #include <linux/mv643xx_i2c.h>
#include <linux/timex.h>
#include <linux/kexec.h>
#include <net/dsa.h> #include <net/dsa.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/timex.h>
#include <asm/kexec.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/kirkwood.h> #include <mach/kirkwood.h>
@ -646,8 +646,7 @@ void __init kirkwood_l2_init(void)
void __init kirkwood_init(void) void __init kirkwood_init(void)
{ {
printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
kirkwood_id(), kirkwood_tclk);
/* /*
* Disable propagation of mbus errors to the CPU local bus, * Disable propagation of mbus errors to the CPU local bus,
@ -671,7 +670,7 @@ void __init kirkwood_init(void)
kirkwood_xor1_init(); kirkwood_xor1_init();
kirkwood_crypto_init(); kirkwood_crypto_init();
#ifdef CONFIG_KEXEC #ifdef CONFIG_KEXEC
kexec_reinit = kirkwood_enable_pcie; kexec_reinit = kirkwood_enable_pcie;
#endif #endif
} }

3
arch/arm/mach-kirkwood/common.h
View File

@ -47,7 +47,8 @@ void kirkwood_i2c_init(void);
void kirkwood_uart0_init(void); void kirkwood_uart0_init(void);
void kirkwood_uart1_init(void); void kirkwood_uart1_init(void);
void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay); void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);
void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *)); void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
int (*dev_ready)(struct mtd_info *));
void kirkwood_audio_init(void); void kirkwood_audio_init(void);
void kirkwood_restart(char, const char *); void kirkwood_restart(char, const char *);
void kirkwood_clk_init(void); void kirkwood_clk_init(void);

2
arch/arm/mach-kirkwood/cpuidle.c
View File

@ -64,7 +64,7 @@ static int kirkwood_init_cpuidle(void)
cpuidle_register_driver(&kirkwood_idle_driver); cpuidle_register_driver(&kirkwood_idle_driver);
if (cpuidle_register_device(device)) { if (cpuidle_register_device(device)) {
printk(KERN_ERR "kirkwood_init_cpuidle: Failed registering\n"); pr_err("kirkwood_init_cpuidle: Failed registering\n");
return -EIO; return -EIO;
} }
return 0; return 0;

2
arch/arm/mach-kirkwood/dockstar-setup.c
View File

@ -93,7 +93,7 @@ static void __init dockstar_init(void)
if (gpio_request(29, "USB Power Enable") != 0 || if (gpio_request(29, "USB Power Enable") != 0 ||
gpio_direction_output(29, 1) != 0) gpio_direction_output(29, 1) != 0)
printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n"); pr_err("can't set up GPIO 29 (USB Power Enable)\n");
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&dockstar_ge00_data); kirkwood_ge00_init(&dockstar_ge00_data);

4
arch/arm/mach-kirkwood/mpp.c
View File

@ -30,8 +30,8 @@ static unsigned int __init kirkwood_variant(void)
if (dev == MV88F6180_DEV_ID) if (dev == MV88F6180_DEV_ID)
return MPP_F6180_MASK; return MPP_F6180_MASK;
printk(KERN_ERR "MPP setup: unknown kirkwood variant " pr_err("MPP setup: unknown kirkwood variant (dev %#x rev %#x)\n",
"(dev %#x rev %#x)\n", dev, rev); dev, rev);
return 0; return 0;
} }

4
arch/arm/mach-kirkwood/netspace_v2-setup.c
View File

@ -79,7 +79,7 @@ static struct platform_device netspace_v2_gpio_buttons = {
.name = "gpio-keys", .name = "gpio-keys",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &netspace_v2_button_data, .platform_data = &netspace_v2_button_data,
}, },
}; };
@ -211,7 +211,7 @@ static unsigned int netspace_v2_mpp_config[] __initdata = {
MPP29_GPIO, /* Blue led (slow register) */ MPP29_GPIO, /* Blue led (slow register) */
MPP30_GPIO, /* Blue led (command register) */ MPP30_GPIO, /* Blue led (command register) */
MPP31_GPIO, /* Board power off */ MPP31_GPIO, /* Board power off */
MPP32_GPIO, /* Power button (0 = Released, 1 = Pushed) */ MPP32_GPIO, /* Power button (0 = Released, 1 = Pushed) */
MPP33_GPO, /* Fan speed (bit 2) */ MPP33_GPO, /* Fan speed (bit 2) */
0 0
}; };

14
arch/arm/mach-kirkwood/openrd-setup.c
View File

@ -121,14 +121,12 @@ static int __init uart1_mpp_config(void)
kirkwood_mpp_conf(openrd_uart1_mpp_config); kirkwood_mpp_conf(openrd_uart1_mpp_config);
if (gpio_request(34, "SD_UART1_SEL")) { if (gpio_request(34, "SD_UART1_SEL")) {
printk(KERN_ERR "GPIO request failed for SD/UART1 selection" pr_err("GPIO request 34 failed for SD/UART1 selection\n");
", gpio: 34\n");
return -EIO; return -EIO;
} }
if (gpio_request(28, "RS232_RS485_SEL")) { if (gpio_request(28, "RS232_RS485_SEL")) {
printk(KERN_ERR "GPIO request failed for RS232/RS485 selection" pr_err("GPIO request 28 failed for RS232/RS485 selection\n");
", gpio# 28\n");
gpio_free(34); gpio_free(34);
return -EIO; return -EIO;
} }
@ -185,15 +183,13 @@ static void __init openrd_init(void)
if (uart1 <= 0) { if (uart1 <= 0) {
if (uart1 < 0) if (uart1 < 0)
printk(KERN_ERR "Invalid kernel parameter to select " pr_err("Invalid kernel parameter to select UART1. Defaulting to SD. ERROR CODE: %d\n",
"UART1. Defaulting to SD. ERROR CODE: %d\n", uart1);
uart1);
/* Select SD /* Select SD
* Pin # 34: 0 => UART1, 1 => SD */ * Pin # 34: 0 => UART1, 1 => SD */
if (gpio_request(34, "SD_UART1_SEL")) { if (gpio_request(34, "SD_UART1_SEL")) {
printk(KERN_ERR "GPIO request failed for SD/UART1 " pr_err("GPIO request 34 failed for SD/UART1 selection\n");
"selection, gpio: 34\n");
} else { } else {
gpio_direction_output(34, 1); gpio_direction_output(34, 1);

13
arch/arm/mach-kirkwood/pcie.c
View File

@ -26,7 +26,7 @@ static void kirkwood_enable_pcie_clk(const char *port)
clk = clk_get_sys("pcie", port); clk = clk_get_sys("pcie", port);
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
printk(KERN_ERR "PCIE clock %s missing\n", port); pr_err("PCIE clock %s missing\n", port);
return; return;
} }
clk_prepare_enable(clk); clk_prepare_enable(clk);
@ -168,7 +168,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
return 0; return 0;
index = pcie_port_map[nr]; index = pcie_port_map[nr];
printk(KERN_INFO "PCI: bus%d uses PCIe port %d\n", sys->busnr, index); pr_info("PCI: bus%d uses PCIe port %d\n", sys->busnr, index);
pp = kzalloc(sizeof(*pp), GFP_KERNEL); pp = kzalloc(sizeof(*pp), GFP_KERNEL);
if (!pp) if (!pp)
@ -186,7 +186,8 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
case 1: case 1:
kirkwood_enable_pcie_clk("1"); kirkwood_enable_pcie_clk("1");
pcie1_ioresources_init(pp); pcie1_ioresources_init(pp);
pci_ioremap_io(SZ_64K * sys->busnr, KIRKWOOD_PCIE1_IO_PHYS_BASE); pci_ioremap_io(SZ_64K * sys->busnr,
KIRKWOOD_PCIE1_IO_PHYS_BASE);
break; break;
default: default:
panic("PCIe setup: invalid controller %d", index); panic("PCIe setup: invalid controller %d", index);
@ -257,13 +258,13 @@ static struct hw_pci kirkwood_pci __initdata = {
static void __init add_pcie_port(int index, void __iomem *base) static void __init add_pcie_port(int index, void __iomem *base)
{ {
printk(KERN_INFO "Kirkwood PCIe port %d: ", index); pr_info("Kirkwood PCIe port %d: ", index);
if (orion_pcie_link_up(base)) { if (orion_pcie_link_up(base)) {
printk(KERN_INFO "link up\n"); pr_info("link up\n");
pcie_port_map[num_pcie_ports++] = index; pcie_port_map[num_pcie_ports++] = index;
} else } else
printk(KERN_INFO "link down, ignoring\n"); pr_info("link down, ignoring\n");
} }
void __init kirkwood_pcie_init(unsigned int portmask) void __init kirkwood_pcie_init(unsigned int portmask)

2
arch/arm/mach-kirkwood/sheevaplug-setup.c
View File

@ -117,7 +117,7 @@ static void __init sheevaplug_init(void)
if (gpio_request(29, "USB Power Enable") != 0 || if (gpio_request(29, "USB Power Enable") != 0 ||
gpio_direction_output(29, 1) != 0) gpio_direction_output(29, 1) != 0)
printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n"); pr_err("can't set up GPIO 29 (USB Power Enable)\n");
kirkwood_ehci_init(); kirkwood_ehci_init();
kirkwood_ge00_init(&sheevaplug_ge00_data); kirkwood_ge00_init(&sheevaplug_ge00_data);

3
arch/arm/mach-kirkwood/ts41x-setup.c
View File

@ -170,8 +170,7 @@ static int __init ts41x_pci_init(void)
else else
kirkwood_pcie_init(KW_PCIE0); kirkwood_pcie_init(KW_PCIE0);
} }
return 0;
return 0;
} }
subsys_initcall(ts41x_pci_init); subsys_initcall(ts41x_pci_init);