Convert all instances of using device printk helpers with struct device embedded in struct i2c_adapter to the new i2c-specific macros that hide that dereference.
Signed-off-by: Bartosz Golaszewski <[email protected]> --- drivers/i2c/busses/i2c-ali15x3.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index 418d11266671e314aa2fb882ece025dc0ae998da..bd62aa8d645004bef121fa46efc1d7afc473332a 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c @@ -223,7 +223,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap) int result = 0; int timeout = 0; - dev_dbg(&adap->dev, "Transaction (pre): STS=%02x, CNT=%02x, CMD=%02x, " + i2c_dbg(adap, "Transaction (pre): STS=%02x, CNT=%02x, CMD=%02x, " "ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTSTS), inb_p(SMBHSTCNT), inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0), inb_p(SMBHSTDAT1)); @@ -255,7 +255,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap) then the BUSY bit may come back on when you try and use the chip again. If that's the case you are stuck. */ - dev_info(&adap->dev, "Resetting entire SMB Bus to " + i2c_info(adap, "Resetting entire SMB Bus to " "clear busy condition (%02x)\n", temp); outb_p(ALI15X3_T_OUT, SMBHSTCNT); temp = inb_p(SMBHSTSTS); @@ -270,7 +270,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap) /* this is probably going to be correctable only by a power reset as one of the bits now appears to be stuck */ /* This may be a bus or device with electrical problems. */ - dev_err(&adap->dev, "SMBus reset failed! (0x%02x) - " + i2c_err(adap, "SMBus reset failed! (0x%02x) - " "controller or device on bus is probably hung\n", temp); return -EBUSY; @@ -299,7 +299,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap) if (temp & ALI15X3_STS_TERM) { result = -EIO; - dev_dbg(&adap->dev, "Error: Failed bus transaction\n"); + i2c_dbg(adap, "Error: Failed bus transaction\n"); } /* @@ -310,7 +310,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap) */ if (temp & ALI15X3_STS_COLL) { result = -ENXIO; - dev_dbg(&adap->dev, + i2c_dbg(adap, "Error: no response or bus collision ADD=%02x\n", inb_p(SMBHSTADD)); } @@ -318,9 +318,9 @@ static int ali15x3_transaction(struct i2c_adapter *adap) /* haven't ever seen this */ if (temp & ALI15X3_STS_DEV) { result = -EIO; - dev_err(&adap->dev, "Error: device error\n"); + i2c_err(adap, "Error: device error\n"); } - dev_dbg(&adap->dev, "Transaction (post): STS=%02x, CNT=%02x, CMD=%02x, " + i2c_dbg(adap, "Transaction (post): STS=%02x, CNT=%02x, CMD=%02x, " "ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTSTS), inb_p(SMBHSTCNT), inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0), inb_p(SMBHSTDAT1)); @@ -347,7 +347,7 @@ static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr, temp = inb_p(SMBHSTSTS); } if (timeout >= MAX_TIMEOUT) { - dev_err(&adap->dev, "Idle wait Timeout! STS=0x%02x\n", temp); + i2c_err(adap, "Idle wait Timeout! STS=0x%02x\n", temp); } switch (size) { @@ -404,7 +404,7 @@ static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr, size = ALI15X3_BLOCK_DATA; break; default: - dev_warn(&adap->dev, "Unsupported transaction %d\n", size); + i2c_warn(adap, "Unsupported transaction %d\n", size); return -EOPNOTSUPP; } @@ -437,7 +437,7 @@ static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr, outb_p(inb_p(SMBHSTCNT) | ALI15X3_BLOCK_CLR, SMBHSTCNT); for (i = 1; i <= data->block[0]; i++) { data->block[i] = inb_p(SMBBLKDAT); - dev_dbg(&adap->dev, "Blk: len=%d, i=%d, data=%02x\n", + i2c_dbg(adap, "Blk: len=%d, i=%d, data=%02x\n", len, i, data->block[i]); } break; -- 2.47.3
