lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 317/329] MIPS: Octeon: Fix logging messages with spurious periods after newlines
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Joe Perches <joe@perches.com>

    [ Upstream commit db6775ca6e0353d2618ca7d5e210fc36ad43bbd4 ]

    Using a period after a newline causes bad output.

    Fixes: 64b139f97c01 ("MIPS: OCTEON: irq: add CIB and other fixes")
    Signed-off-by: Joe 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: James Hogan <jhogan@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/mips/cavium-octeon/octeon-irq.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/arch/mips/cavium-octeon/octeon-irq.c
    +++ b/arch/mips/cavium-octeon/octeon-irq.c
    @@ -2271,7 +2271,7 @@ static int __init octeon_irq_init_cib(st

    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;
    }
    @@ -2283,7 +2283,7 @@ static int __init octeon_irq_init_cib(st

    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(
    @@ -2291,7 +2291,7 @@ static int __init octeon_irq_init_cib(st

    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(
    @@ -2299,7 +2299,7 @@ static int __init octeon_irq_init_cib(st

    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;
    }
    @@ -2309,7 +2309,7 @@ static int __init octeon_irq_init_cib(st
    &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;
    }


    \
     
     \ /
      Last update: 2018-05-28 15:58    [W:4.284 / U:0.340 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site