lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 044/136] i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output
    Date
    From: Russell King <rmk+kernel@armlinux.org.uk>

    [ Upstream commit 88b73ee7ca4c90baf136ed5a8377fc5a9b73ac08 ]

    The IRQ log output is supposed to appear on a single line. However,
    commit 3a2dc1677b60 ("i2c: pxa: Update debug function to dump more info
    on error") resulted in it being printed one-entry-per-line, which is
    excessively long.

    Fixing this is not a trivial matter; using pr_cont() doesn't work as
    the previous dev_dbg() may not have been compiled in, or may be
    dynamic.

    Since the rest of this function output is at error level, and is also
    debug output, promote this to error level as well to avoid this
    problem.

    Reduce the number of always zero prefix digits to save screen real-
    estate.

    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/busses/i2c-pxa.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
    index ecc84aea51319..e300f9530f190 100644
    --- a/drivers/i2c/busses/i2c-pxa.c
    +++ b/drivers/i2c/busses/i2c-pxa.c
    @@ -315,11 +315,10 @@ static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
    dev_err(dev, "IBMR: %08x IDBR: %08x ICR: %08x ISR: %08x\n",
    readl(_IBMR(i2c)), readl(_IDBR(i2c)), readl(_ICR(i2c)),
    readl(_ISR(i2c)));
    - dev_dbg(dev, "log: ");
    + dev_err(dev, "log:");
    for (i = 0; i < i2c->irqlogidx; i++)
    - pr_debug("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]);
    -
    - pr_debug("\n");
    + pr_cont(" [%03x:%05x]", i2c->isrlog[i], i2c->icrlog[i]);
    + pr_cont("\n");
    }

    #else /* ifdef DEBUG */
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:55    [W:4.426 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site