diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-11-17 10:07:31 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:01:45 -0500 |
commit | ab75dc02c151c9d2a2fd446334d740b097a3b9db (patch) | |
tree | 45270931b489a1260e2d2aa3b9ffb1ef7347cfb6 /arch/mips/ar7 | |
parent | 864c6c22e9a5742b0f43c983b6c405d52817bacd (diff) |
MIPS: Fix up inconsistency in panic() string argument.
Panic() invokes printk() to add a \n internally, so panic arguments should
not themselves end in \n. Panic invocations in arch/mips and elsewhere
are inconsistently sometimes terminating in \n, sometimes not.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ar7')
-rw-r--r-- | arch/mips/ar7/platform.c | 2 | ||||
-rw-r--r-- | arch/mips/ar7/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c index 33ffecf6a6d6..60102392af01 100644 --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c | |||
@@ -536,7 +536,7 @@ static int __init ar7_register_uarts(void) | |||
536 | 536 | ||
537 | bus_clk = clk_get(NULL, "bus"); | 537 | bus_clk = clk_get(NULL, "bus"); |
538 | if (IS_ERR(bus_clk)) | 538 | if (IS_ERR(bus_clk)) |
539 | panic("unable to get bus clk\n"); | 539 | panic("unable to get bus clk"); |
540 | 540 | ||
541 | uart_port.type = PORT_AR7; | 541 | uart_port.type = PORT_AR7; |
542 | uart_port.uartclk = clk_get_rate(bus_clk) / 2; | 542 | uart_port.uartclk = clk_get_rate(bus_clk) / 2; |
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c index f20b53e597c4..9a357fffcfbe 100644 --- a/arch/mips/ar7/setup.c +++ b/arch/mips/ar7/setup.c | |||
@@ -96,7 +96,7 @@ void __init plat_mem_setup(void) | |||
96 | 96 | ||
97 | io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000); | 97 | io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000); |
98 | if (!io_base) | 98 | if (!io_base) |
99 | panic("Can't remap IO base!\n"); | 99 | panic("Can't remap IO base!"); |
100 | set_io_port_base(io_base); | 100 | set_io_port_base(io_base); |
101 | 101 | ||
102 | prom_meminit(); | 102 | prom_meminit(); |