aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/lantiq
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
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')
-rw-r--r--arch/mips/lantiq/clk.c4
-rw-r--r--arch/mips/lantiq/irq.c12
-rw-r--r--arch/mips/lantiq/xway/dma.c6
-rw-r--r--arch/mips/lantiq/xway/ebu.c6
-rw-r--r--arch/mips/lantiq/xway/pmu.c8
-rw-r--r--arch/mips/lantiq/xway/reset.c6
6 files changed, 21 insertions, 21 deletions
diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
index 77ed70fc2fe5..412814fdd3ee 100644
--- a/arch/mips/lantiq/clk.c
+++ b/arch/mips/lantiq/clk.c
@@ -134,11 +134,11 @@ void __init plat_time_init(void)
134 struct clk *clk; 134 struct clk *clk;
135 135
136 if (insert_resource(&iomem_resource, &ltq_cgu_resource) < 0) 136 if (insert_resource(&iomem_resource, &ltq_cgu_resource) < 0)
137 panic("Failed to insert cgu memory\n"); 137 panic("Failed to insert cgu memory");
138 138
139 if (request_mem_region(ltq_cgu_resource.start, 139 if (request_mem_region(ltq_cgu_resource.start,
140 resource_size(&ltq_cgu_resource), "cgu") < 0) 140 resource_size(&ltq_cgu_resource), "cgu") < 0)
141 panic("Failed to request cgu memory\n"); 141 panic("Failed to request cgu memory");
142 142
143 ltq_cgu_membase = ioremap_nocache(ltq_cgu_resource.start, 143 ltq_cgu_membase = ioremap_nocache(ltq_cgu_resource.start,
144 resource_size(&ltq_cgu_resource)); 144 resource_size(&ltq_cgu_resource));
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
index f9737bb3c5ab..51fa0a4ba556 100644
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
@@ -249,28 +249,28 @@ void __init arch_init_irq(void)
249 int i; 249 int i;
250 250
251 if (insert_resource(&iomem_resource, &ltq_icu_resource) < 0) 251 if (insert_resource(&iomem_resource, &ltq_icu_resource) < 0)
252 panic("Failed to insert icu memory\n"); 252 panic("Failed to insert icu memory");
253 253
254 if (request_mem_region(ltq_icu_resource.start, 254 if (request_mem_region(ltq_icu_resource.start,
255 resource_size(&ltq_icu_resource), "icu") < 0) 255 resource_size(&ltq_icu_resource), "icu") < 0)
256 panic("Failed to request icu memory\n"); 256 panic("Failed to request icu memory");
257 257
258 ltq_icu_membase = ioremap_nocache(ltq_icu_resource.start, 258 ltq_icu_membase = ioremap_nocache(ltq_icu_resource.start,
259 resource_size(&ltq_icu_resource)); 259 resource_size(&ltq_icu_resource));
260 if (!ltq_icu_membase) 260 if (!ltq_icu_membase)
261 panic("Failed to remap icu memory\n"); 261 panic("Failed to remap icu memory");
262 262
263 if (insert_resource(&iomem_resource, &ltq_eiu_resource) < 0) 263 if (insert_resource(&iomem_resource, &ltq_eiu_resource) < 0)
264 panic("Failed to insert eiu memory\n"); 264 panic("Failed to insert eiu memory");
265 265
266 if (request_mem_region(ltq_eiu_resource.start, 266 if (request_mem_region(ltq_eiu_resource.start,
267 resource_size(&ltq_eiu_resource), "eiu") < 0) 267 resource_size(&ltq_eiu_resource), "eiu") < 0)
268 panic("Failed to request eiu memory\n"); 268 panic("Failed to request eiu memory");
269 269
270 ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start, 270 ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,
271 resource_size(&ltq_eiu_resource)); 271 resource_size(&ltq_eiu_resource));
272 if (!ltq_eiu_membase) 272 if (!ltq_eiu_membase)
273 panic("Failed to remap eiu memory\n"); 273 panic("Failed to remap eiu memory");
274 274
275 /* make sure all irqs are turned off by default */ 275 /* make sure all irqs are turned off by default */
276 for (i = 0; i < 5; i++) 276 for (i = 0; i < 5; i++)
diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
index cbb6ae5747b9..b210e936c7c3 100644
--- a/arch/mips/lantiq/xway/dma.c
+++ b/arch/mips/lantiq/xway/dma.c
@@ -222,17 +222,17 @@ ltq_dma_init(void)
222 222
223 /* insert and request the memory region */ 223 /* insert and request the memory region */
224 if (insert_resource(&iomem_resource, &ltq_dma_resource) < 0) 224 if (insert_resource(&iomem_resource, &ltq_dma_resource) < 0)
225 panic("Failed to insert dma memory\n"); 225 panic("Failed to insert dma memory");
226 226
227 if (request_mem_region(ltq_dma_resource.start, 227 if (request_mem_region(ltq_dma_resource.start,
228 resource_size(&ltq_dma_resource), "dma") < 0) 228 resource_size(&ltq_dma_resource), "dma") < 0)
229 panic("Failed to request dma memory\n"); 229 panic("Failed to request dma memory");
230 230
231 /* remap dma register range */ 231 /* remap dma register range */
232 ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start, 232 ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start,
233 resource_size(&ltq_dma_resource)); 233 resource_size(&ltq_dma_resource));
234 if (!ltq_dma_membase) 234 if (!ltq_dma_membase)
235 panic("Failed to remap dma memory\n"); 235 panic("Failed to remap dma memory");
236 236
237 /* power up and reset the dma engine */ 237 /* power up and reset the dma engine */
238 ltq_pmu_enable(PMU_DMA); 238 ltq_pmu_enable(PMU_DMA);
diff --git a/arch/mips/lantiq/xway/ebu.c b/arch/mips/lantiq/xway/ebu.c
index 033b3184c7a7..862e3e830680 100644
--- a/arch/mips/lantiq/xway/ebu.c
+++ b/arch/mips/lantiq/xway/ebu.c
@@ -32,17 +32,17 @@ static int __init lantiq_ebu_init(void)
32{ 32{
33 /* insert and request the memory region */ 33 /* insert and request the memory region */
34 if (insert_resource(&iomem_resource, &ltq_ebu_resource) < 0) 34 if (insert_resource(&iomem_resource, &ltq_ebu_resource) < 0)
35 panic("Failed to insert ebu memory\n"); 35 panic("Failed to insert ebu memory");
36 36
37 if (request_mem_region(ltq_ebu_resource.start, 37 if (request_mem_region(ltq_ebu_resource.start,
38 resource_size(&ltq_ebu_resource), "ebu") < 0) 38 resource_size(&ltq_ebu_resource), "ebu") < 0)
39 panic("Failed to request ebu memory\n"); 39 panic("Failed to request ebu memory");
40 40
41 /* remap ebu register range */ 41 /* remap ebu register range */
42 ltq_ebu_membase = ioremap_nocache(ltq_ebu_resource.start, 42 ltq_ebu_membase = ioremap_nocache(ltq_ebu_resource.start,
43 resource_size(&ltq_ebu_resource)); 43 resource_size(&ltq_ebu_resource));
44 if (!ltq_ebu_membase) 44 if (!ltq_ebu_membase)
45 panic("Failed to remap ebu memory\n"); 45 panic("Failed to remap ebu memory");
46 46
47 /* make sure to unprotect the memory region where flash is located */ 47 /* make sure to unprotect the memory region where flash is located */
48 ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0); 48 ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0);
diff --git a/arch/mips/lantiq/xway/pmu.c b/arch/mips/lantiq/xway/pmu.c
index 39f0d2641cbf..fe85361e032e 100644
--- a/arch/mips/lantiq/xway/pmu.c
+++ b/arch/mips/lantiq/xway/pmu.c
@@ -40,7 +40,7 @@ void ltq_pmu_enable(unsigned int module)
40 do {} while (--err && (ltq_pmu_r32(LTQ_PMU_PWDSR) & module)); 40 do {} while (--err && (ltq_pmu_r32(LTQ_PMU_PWDSR) & module));
41 41
42 if (!err) 42 if (!err)
43 panic("activating PMU module failed!\n"); 43 panic("activating PMU module failed!");
44} 44}
45EXPORT_SYMBOL(ltq_pmu_enable); 45EXPORT_SYMBOL(ltq_pmu_enable);
46 46
@@ -53,16 +53,16 @@ EXPORT_SYMBOL(ltq_pmu_disable);
53int __init ltq_pmu_init(void) 53int __init ltq_pmu_init(void)
54{ 54{
55 if (insert_resource(&iomem_resource, &ltq_pmu_resource) < 0) 55 if (insert_resource(&iomem_resource, &ltq_pmu_resource) < 0)
56 panic("Failed to insert pmu memory\n"); 56 panic("Failed to insert pmu memory");
57 57
58 if (request_mem_region(ltq_pmu_resource.start, 58 if (request_mem_region(ltq_pmu_resource.start,
59 resource_size(&ltq_pmu_resource), "pmu") < 0) 59 resource_size(&ltq_pmu_resource), "pmu") < 0)
60 panic("Failed to request pmu memory\n"); 60 panic("Failed to request pmu memory");
61 61
62 ltq_pmu_membase = ioremap_nocache(ltq_pmu_resource.start, 62 ltq_pmu_membase = ioremap_nocache(ltq_pmu_resource.start,
63 resource_size(&ltq_pmu_resource)); 63 resource_size(&ltq_pmu_resource));
64 if (!ltq_pmu_membase) 64 if (!ltq_pmu_membase)
65 panic("Failed to remap pmu memory\n"); 65 panic("Failed to remap pmu memory");
66 return 0; 66 return 0;
67} 67}
68 68
diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
index 3d41f0bb5bf7..8b66bd87f0c1 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;