lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[011/156] i2c-powermac: Be less verbose in the absence of real errors.
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

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

    From: Jean Delvare <khali@linux-fr.org>

    commit 8e4b980c28c91cfe9d0ce0431bc0af56e146b49e upstream.

    Be less verbose in the absence of real errors. We don't have to report
    failed probes to the users, it's only confusing them.

    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Tested-by: Andrey Gusev <ronne@list.ru>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/i2c/busses/i2c-powermac.c | 25 ++++++++++++++++++-------
    1 file changed, 18 insertions(+), 7 deletions(-)

    --- a/drivers/i2c/busses/i2c-powermac.c
    +++ b/drivers/i2c/busses/i2c-powermac.c
    @@ -122,9 +122,14 @@ static s32 i2c_powermac_smbus_xfer( stru

    rc = pmac_i2c_xfer(bus, addrdir, subsize, subaddr, buf, len);
    if (rc) {
    - dev_err(&adap->dev,
    - "I2C transfer at 0x%02x failed, size %d, err %d\n",
    - addrdir >> 1, size, rc);
    + if (rc == -ENXIO)
    + dev_dbg(&adap->dev,
    + "I2C transfer at 0x%02x failed, size %d, "
    + "err %d\n", addrdir >> 1, size, rc);
    + else
    + dev_err(&adap->dev,
    + "I2C transfer at 0x%02x failed, size %d, "
    + "err %d\n", addrdir >> 1, size, rc);
    goto bail;
    }

    @@ -175,10 +180,16 @@ static int i2c_powermac_master_xfer( str
    goto bail;
    }
    rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs->buf, msgs->len);
    - if (rc < 0)
    - dev_err(&adap->dev, "I2C %s 0x%02x failed, err %d\n",
    - addrdir & 1 ? "read from" : "write to", addrdir >> 1,
    - rc);
    + if (rc < 0) {
    + if (rc == -ENXIO)
    + dev_dbg(&adap->dev, "I2C %s 0x%02x failed, err %d\n",
    + addrdir & 1 ? "read from" : "write to",
    + addrdir >> 1, rc);
    + else
    + dev_err(&adap->dev, "I2C %s 0x%02x failed, err %d\n",
    + addrdir & 1 ? "read from" : "write to",
    + addrdir >> 1, rc);
    + }
    bail:
    pmac_i2c_close(bus);
    return rc < 0 ? rc : 1;



    \
     
     \ /
      Last update: 2010-03-31 01:43    [W:3.877 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site