Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae44822 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

MIPS: Octeon: Fix logging messages with spurious periods after newlines 



[ Upstream commit db6775ca6e0353d2618ca7d5e210fc36ad43bbd4 ]

Using a period after a newline causes bad output.

Fixes: 64b139f9 ("MIPS: OCTEON: irq: add CIB and other fixes")
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17886/


Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 699c079a

arch/mips/cavium-octeon/octeon-irq.c

+5 −5
Original line number Diff line number Diff line
@@ -2240,7 +2240,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, 


	parent_irq = irq_of_parse_and_map(ciu_node, 0);

	if (!parent_irq) {

		pr_err("ERROR: Couldn't acquire parent_irq for %s\n.",

		pr_err("ERROR: Couldn't acquire parent_irq for %s\n",

			ciu_node->name);

		return -EINVAL;

	}
@@ -2252,7 +2252,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, 


	addr = of_get_address(ciu_node, 0, NULL, NULL);

	if (!addr) {

		pr_err("ERROR: Couldn't acquire reg(0) %s\n.", ciu_node->name);

		pr_err("ERROR: Couldn't acquire reg(0) %s\n", ciu_node->name);

		return -EINVAL;

	}

	host_data->raw_reg = (u64)phys_to_virt(
@@ -2260,7 +2260,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, 


	addr = of_get_address(ciu_node, 1, NULL, NULL);

	if (!addr) {

		pr_err("ERROR: Couldn't acquire reg(1) %s\n.", ciu_node->name);

		pr_err("ERROR: Couldn't acquire reg(1) %s\n", ciu_node->name);

		return -EINVAL;

	}

	host_data->en_reg = (u64)phys_to_virt(
@@ -2268,7 +2268,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, 


	r = of_property_read_u32(ciu_node, "cavium,max-bits", &val);

	if (r) {

		pr_err("ERROR: Couldn't read cavium,max-bits from %s\n.",

		pr_err("ERROR: Couldn't read cavium,max-bits from %s\n",

			ciu_node->name);

		return r;

	}
@@ -2278,7 +2278,7 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, 
					   &octeon_irq_domain_cib_ops,

					   host_data);

	if (!cib_domain) {

		pr_err("ERROR: Couldn't irq_domain_add_linear()\n.");

		pr_err("ERROR: Couldn't irq_domain_add_linear()\n");

		return -ENOMEM;

	}