diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-09-18 10:05:26 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-10-29 16:24:19 -0400 |
commit | f7777dcc7550531ae551f544bdc391c65d0e1731 (patch) | |
tree | ab95758874c5d534f95ec0814760a7805ba6d175 | |
parent | 761845f0f68cf6eba9cad0a58d977b89f8d4486f (diff) |
MIPS: Panic messages should not end in \n.
Panic() is going to add a \n itself and it's annoying if a panic message rolls
of the screen on a device with no scrollback.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/alchemy/devboards/db1235.c | 2 | ||||
-rw-r--r-- | arch/mips/cavium-octeon/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/irq_cpu.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/smp-bmips.c | 4 | ||||
-rw-r--r-- | arch/mips/lantiq/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/lantiq/xway/sysctrl.c | 2 | ||||
-rw-r--r-- | arch/mips/netlogic/common/smp.c | 2 | ||||
-rw-r--r-- | arch/mips/ralink/clk.c | 2 | ||||
-rw-r--r-- | arch/mips/ralink/mt7620.c | 2 | ||||
-rw-r--r-- | arch/mips/ralink/of.c | 2 | ||||
-rw-r--r-- | arch/mips/ralink/rt305x.c | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/arch/mips/alchemy/devboards/db1235.c b/arch/mips/alchemy/devboards/db1235.c index c76a90f78664..bac19dc43d1d 100644 --- a/arch/mips/alchemy/devboards/db1235.c +++ b/arch/mips/alchemy/devboards/db1235.c | |||
@@ -59,7 +59,7 @@ void __init board_setup(void) | |||
59 | ret = -ENODEV; | 59 | ret = -ENODEV; |
60 | } | 60 | } |
61 | if (ret) | 61 | if (ret) |
62 | panic("cannot initialize board support\n"); | 62 | panic("cannot initialize board support"); |
63 | } | 63 | } |
64 | 64 | ||
65 | int __init db1235_arch_init(void) | 65 | int __init db1235_arch_init(void) |
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index b212ae12e5ac..331b837cec57 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
@@ -999,7 +999,7 @@ void __init plat_mem_setup(void) | |||
999 | 999 | ||
1000 | if (total == 0) | 1000 | if (total == 0) |
1001 | panic("Unable to allocate memory from " | 1001 | panic("Unable to allocate memory from " |
1002 | "cvmx_bootmem_phy_alloc\n"); | 1002 | "cvmx_bootmem_phy_alloc"); |
1003 | } | 1003 | } |
1004 | 1004 | ||
1005 | /* | 1005 | /* |
@@ -1081,7 +1081,7 @@ void __init device_tree_init(void) | |||
1081 | /* Copy the default tree from init memory. */ | 1081 | /* Copy the default tree from init memory. */ |
1082 | initial_boot_params = early_init_dt_alloc_memory_arch(dt_size, 8); | 1082 | initial_boot_params = early_init_dt_alloc_memory_arch(dt_size, 8); |
1083 | if (initial_boot_params == NULL) | 1083 | if (initial_boot_params == NULL) |
1084 | panic("Could not allocate initial_boot_params\n"); | 1084 | panic("Could not allocate initial_boot_params"); |
1085 | memcpy(initial_boot_params, fdt, dt_size); | 1085 | memcpy(initial_boot_params, fdt, dt_size); |
1086 | 1086 | ||
1087 | if (do_prune) { | 1087 | if (do_prune) { |
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c index 72ef2d25cbf2..e498f2b3646a 100644 --- a/arch/mips/kernel/irq_cpu.c +++ b/arch/mips/kernel/irq_cpu.c | |||
@@ -150,7 +150,7 @@ int __init mips_cpu_intc_init(struct device_node *of_node, | |||
150 | domain = irq_domain_add_legacy(of_node, 8, MIPS_CPU_IRQ_BASE, 0, | 150 | domain = irq_domain_add_legacy(of_node, 8, MIPS_CPU_IRQ_BASE, 0, |
151 | &mips_cpu_intc_irq_domain_ops, NULL); | 151 | &mips_cpu_intc_irq_domain_ops, NULL); |
152 | if (!domain) | 152 | if (!domain) |
153 | panic("Failed to add irqdomain for MIPS CPU\n"); | 153 | panic("Failed to add irqdomain for MIPS CPU"); |
154 | 154 | ||
155 | return 0; | 155 | return 0; |
156 | } | 156 | } |
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c index 126da74d4c55..2362665ba496 100644 --- a/arch/mips/kernel/smp-bmips.c +++ b/arch/mips/kernel/smp-bmips.c | |||
@@ -136,10 +136,10 @@ static void bmips_prepare_cpus(unsigned int max_cpus) | |||
136 | { | 136 | { |
137 | if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU, | 137 | if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU, |
138 | "smp_ipi0", NULL)) | 138 | "smp_ipi0", NULL)) |
139 | panic("Can't request IPI0 interrupt\n"); | 139 | panic("Can't request IPI0 interrupt"); |
140 | if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU, | 140 | if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU, |
141 | "smp_ipi1", NULL)) | 141 | "smp_ipi1", NULL)) |
142 | panic("Can't request IPI1 interrupt\n"); | 142 | panic("Can't request IPI1 interrupt"); |
143 | } | 143 | } |
144 | 144 | ||
145 | /* | 145 | /* |
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c index eb3e18659630..85685e1cdb89 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c | |||
@@ -390,7 +390,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) | |||
390 | ret = of_irq_to_resource_table(eiu_node, | 390 | ret = of_irq_to_resource_table(eiu_node, |
391 | ltq_eiu_irq, exin_avail); | 391 | ltq_eiu_irq, exin_avail); |
392 | if (ret != exin_avail) | 392 | if (ret != exin_avail) |
393 | panic("failed to load external irq resources\n"); | 393 | panic("failed to load external irq resources"); |
394 | 394 | ||
395 | if (request_mem_region(res.start, resource_size(&res), | 395 | if (request_mem_region(res.start, resource_size(&res), |
396 | res.name) < 0) | 396 | res.name) < 0) |
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c index c24924fe087d..51804b10a036 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c | |||
@@ -128,7 +128,7 @@ static int pmu_enable(struct clk *clk) | |||
128 | do {} while (--retry && (pmu_r32(PWDSR(clk->module)) & clk->bits)); | 128 | do {} while (--retry && (pmu_r32(PWDSR(clk->module)) & clk->bits)); |
129 | 129 | ||
130 | if (!retry) | 130 | if (!retry) |
131 | panic("activating PMU module failed!\n"); | 131 | panic("activating PMU module failed!"); |
132 | 132 | ||
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c index 6f8feb9efcff..c0eded01fde9 100644 --- a/arch/mips/netlogic/common/smp.c +++ b/arch/mips/netlogic/common/smp.c | |||
@@ -245,7 +245,7 @@ static int nlm_parse_cpumask(cpumask_t *wakeup_mask) | |||
245 | return threadmode; | 245 | return threadmode; |
246 | 246 | ||
247 | unsupp: | 247 | unsupp: |
248 | panic("Unsupported CPU mask %lx\n", | 248 | panic("Unsupported CPU mask %lx", |
249 | (unsigned long)cpumask_bits(wakeup_mask)[0]); | 249 | (unsigned long)cpumask_bits(wakeup_mask)[0]); |
250 | return 0; | 250 | return 0; |
251 | } | 251 | } |
diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c index bba0cdfd83bc..5d0983d47161 100644 --- a/arch/mips/ralink/clk.c +++ b/arch/mips/ralink/clk.c | |||
@@ -26,7 +26,7 @@ void ralink_clk_add(const char *dev, unsigned long rate) | |||
26 | struct clk *clk = kzalloc(sizeof(struct clk), GFP_KERNEL); | 26 | struct clk *clk = kzalloc(sizeof(struct clk), GFP_KERNEL); |
27 | 27 | ||
28 | if (!clk) | 28 | if (!clk) |
29 | panic("failed to add clock\n"); | 29 | panic("failed to add clock"); |
30 | 30 | ||
31 | clk->cl.dev_id = dev; | 31 | clk->cl.dev_id = dev; |
32 | clk->cl.clk = clk; | 32 | clk->cl.clk = clk; |
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c index d217509e5300..a3ad56c2372d 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c | |||
@@ -350,7 +350,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info) | |||
350 | name = "MT7620A"; | 350 | name = "MT7620A"; |
351 | soc_info->compatible = "ralink,mt7620a-soc"; | 351 | soc_info->compatible = "ralink,mt7620a-soc"; |
352 | } else { | 352 | } else { |
353 | panic("mt7620: unknown SoC, n0:%08x n1:%08x\n", n0, n1); | 353 | panic("mt7620: unknown SoC, n0:%08x n1:%08x", n0, n1); |
354 | } | 354 | } |
355 | 355 | ||
356 | rev = __raw_readl(sysc + SYSC_REG_CHIP_REV); | 356 | rev = __raw_readl(sysc + SYSC_REG_CHIP_REV); |
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c index ce38d11f9da5..15f21ea96121 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c | |||
@@ -108,7 +108,7 @@ static int __init plat_of_setup(void) | |||
108 | strncpy(of_ids[1].compatible, "palmbus", len); | 108 | strncpy(of_ids[1].compatible, "palmbus", len); |
109 | 109 | ||
110 | if (of_platform_populate(NULL, of_ids, NULL, NULL)) | 110 | if (of_platform_populate(NULL, of_ids, NULL, NULL)) |
111 | panic("failed to populate DT\n"); | 111 | panic("failed to populate DT"); |
112 | 112 | ||
113 | /* make sure ithat the reset controller is setup early */ | 113 | /* make sure ithat the reset controller is setup early */ |
114 | ralink_rst_init(); | 114 | ralink_rst_init(); |
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c index ca7ee3a33790..bb82a82da9e7 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c | |||
@@ -276,7 +276,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info) | |||
276 | name = "RT5350"; | 276 | name = "RT5350"; |
277 | soc_info->compatible = "ralink,rt5350-soc"; | 277 | soc_info->compatible = "ralink,rt5350-soc"; |
278 | } else { | 278 | } else { |
279 | panic("rt305x: unknown SoC, n0:%08x n1:%08x\n", n0, n1); | 279 | panic("rt305x: unknown SoC, n0:%08x n1:%08x", n0, n1); |
280 | } | 280 | } |
281 | 281 | ||
282 | id = __raw_readl(sysc + SYSC_REG_CHIP_ID); | 282 | id = __raw_readl(sysc + SYSC_REG_CHIP_ID); |