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/bcm47xx/setup.c | |
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/bcm47xx/setup.c')
-rw-r--r-- | arch/mips/bcm47xx/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 1cfdda03546a..aab6b0c40a75 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c | |||
@@ -289,7 +289,7 @@ static void __init bcm47xx_register_ssb(void) | |||
289 | err = ssb_bus_ssbbus_register(&(bcm47xx_bus.ssb), SSB_ENUM_BASE, | 289 | err = ssb_bus_ssbbus_register(&(bcm47xx_bus.ssb), SSB_ENUM_BASE, |
290 | bcm47xx_get_invariants); | 290 | bcm47xx_get_invariants); |
291 | if (err) | 291 | if (err) |
292 | panic("Failed to initialize SSB bus (err %d)\n", err); | 292 | panic("Failed to initialize SSB bus (err %d)", err); |
293 | 293 | ||
294 | mcore = &bcm47xx_bus.ssb.mipscore; | 294 | mcore = &bcm47xx_bus.ssb.mipscore; |
295 | if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { | 295 | if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { |
@@ -314,7 +314,7 @@ static void __init bcm47xx_register_bcma(void) | |||
314 | 314 | ||
315 | err = bcma_host_soc_register(&bcm47xx_bus.bcma); | 315 | err = bcma_host_soc_register(&bcm47xx_bus.bcma); |
316 | if (err) | 316 | if (err) |
317 | panic("Failed to initialize BCMA bus (err %d)\n", err); | 317 | panic("Failed to initialize BCMA bus (err %d)", err); |
318 | } | 318 | } |
319 | #endif | 319 | #endif |
320 | 320 | ||