Skip to content

Commit

Permalink
MIPS: Panic messages should not end in \n.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ralf Baechle committed Oct 29, 2013
1 parent 761845f commit f7777dc
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion arch/mips/alchemy/devboards/db1235.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void __init board_setup(void)
ret = -ENODEV;
}
if (ret)
panic("cannot initialize board support\n");
panic("cannot initialize board support");
}

int __init db1235_arch_init(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/cavium-octeon/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ void __init plat_mem_setup(void)

if (total == 0)
panic("Unable to allocate memory from "
"cvmx_bootmem_phy_alloc\n");
"cvmx_bootmem_phy_alloc");
}

/*
Expand Down Expand Up @@ -1081,7 +1081,7 @@ void __init device_tree_init(void)
/* Copy the default tree from init memory. */
initial_boot_params = early_init_dt_alloc_memory_arch(dt_size, 8);
if (initial_boot_params == NULL)
panic("Could not allocate initial_boot_params\n");
panic("Could not allocate initial_boot_params");
memcpy(initial_boot_params, fdt, dt_size);

if (do_prune) {
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/kernel/irq_cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ int __init mips_cpu_intc_init(struct device_node *of_node,
domain = irq_domain_add_legacy(of_node, 8, MIPS_CPU_IRQ_BASE, 0,
&mips_cpu_intc_irq_domain_ops, NULL);
if (!domain)
panic("Failed to add irqdomain for MIPS CPU\n");
panic("Failed to add irqdomain for MIPS CPU");

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/kernel/smp-bmips.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ static void bmips_prepare_cpus(unsigned int max_cpus)
{
if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
"smp_ipi0", NULL))
panic("Can't request IPI0 interrupt\n");
panic("Can't request IPI0 interrupt");
if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
"smp_ipi1", NULL))
panic("Can't request IPI1 interrupt\n");
panic("Can't request IPI1 interrupt");
}

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/lantiq/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
ret = of_irq_to_resource_table(eiu_node,
ltq_eiu_irq, exin_avail);
if (ret != exin_avail)
panic("failed to load external irq resources\n");
panic("failed to load external irq resources");

if (request_mem_region(res.start, resource_size(&res),
res.name) < 0)
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/lantiq/xway/sysctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static int pmu_enable(struct clk *clk)
do {} while (--retry && (pmu_r32(PWDSR(clk->module)) & clk->bits));

if (!retry)
panic("activating PMU module failed!\n");
panic("activating PMU module failed!");

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/netlogic/common/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ static int nlm_parse_cpumask(cpumask_t *wakeup_mask)
return threadmode;

unsupp:
panic("Unsupported CPU mask %lx\n",
panic("Unsupported CPU mask %lx",
(unsigned long)cpumask_bits(wakeup_mask)[0]);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/ralink/clk.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void ralink_clk_add(const char *dev, unsigned long rate)
struct clk *clk = kzalloc(sizeof(struct clk), GFP_KERNEL);

if (!clk)
panic("failed to add clock\n");
panic("failed to add clock");

clk->cl.dev_id = dev;
clk->cl.clk = clk;
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/ralink/mt7620.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
name = "MT7620A";
soc_info->compatible = "ralink,mt7620a-soc";
} else {
panic("mt7620: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
panic("mt7620: unknown SoC, n0:%08x n1:%08x", n0, n1);
}

rev = __raw_readl(sysc + SYSC_REG_CHIP_REV);
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/ralink/of.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int __init plat_of_setup(void)
strncpy(of_ids[1].compatible, "palmbus", len);

if (of_platform_populate(NULL, of_ids, NULL, NULL))
panic("failed to populate DT\n");
panic("failed to populate DT");

/* make sure ithat the reset controller is setup early */
ralink_rst_init();
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/ralink/rt305x.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
name = "RT5350";
soc_info->compatible = "ralink,rt5350-soc";
} else {
panic("rt305x: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
panic("rt305x: unknown SoC, n0:%08x n1:%08x", n0, n1);
}

id = __raw_readl(sysc + SYSC_REG_CHIP_ID);
Expand Down

0 comments on commit f7777dc

Please sign in to comment.