aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/lantiq/xway/reset.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-11-17 10:07:31 -0500
committerRalf Baechle <ralf@linux-mips.org>2011-12-07 17:01:45 -0500
commitab75dc02c151c9d2a2fd446334d740b097a3b9db (patch)
tree45270931b489a1260e2d2aa3b9ffb1ef7347cfb6 /arch/mips/lantiq/xway/reset.c
parent864c6c22e9a5742b0f43c983b6c405d52817bacd (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/lantiq/xway/reset.c')
-rw-r--r--arch/mips/lantiq/xway/reset.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
index 3d41f0bb5bf..8b66bd87f0c 100644
--- a/arch/mips/lantiq/xway/reset.c
+++ b/arch/mips/lantiq/xway/reset.c
@@ -69,17 +69,17 @@ static int __init mips_reboot_setup(void)
69{ 69{
70 /* insert and request the memory region */ 70 /* insert and request the memory region */
71 if (insert_resource(&iomem_resource, &ltq_rcu_resource) < 0) 71 if (insert_resource(&iomem_resource, &ltq_rcu_resource) < 0)
72 panic("Failed to insert rcu memory\n"); 72 panic("Failed to insert rcu memory");
73 73
74 if (request_mem_region(ltq_rcu_resource.start, 74 if (request_mem_region(ltq_rcu_resource.start,
75 resource_size(&ltq_rcu_resource), "rcu") < 0) 75 resource_size(&ltq_rcu_resource), "rcu") < 0)
76 panic("Failed to request rcu memory\n"); 76 panic("Failed to request rcu memory");
77 77
78 /* remap rcu register range */ 78 /* remap rcu register range */
79 ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start, 79 ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start,
80 resource_size(&ltq_rcu_resource)); 80 resource_size(&ltq_rcu_resource));
81 if (!ltq_rcu_membase) 81 if (!ltq_rcu_membase)
82 panic("Failed to remap rcu memory\n"); 82 panic("Failed to remap rcu memory");
83 83
84 _machine_restart = ltq_machine_restart; 84 _machine_restart = ltq_machine_restart;
85 _machine_halt = ltq_machine_halt; 85 _machine_halt = ltq_machine_halt;