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-ali1535.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c index 1eac358380405838d15551e353605cab0a7e5e65..bf0f36450c5930f86b122618d17eecf1782dd776 100644 --- a/drivers/i2c/busses/i2c-ali1535.c +++ b/drivers/i2c/busses/i2c-ali1535.c @@ -215,7 +215,7 @@ static int ali1535_transaction(struct i2c_adapter *adap) int result = 0; int timeout = 0; - dev_dbg(&adap->dev, "Transaction (pre): STS=%02x, TYP=%02x, " + i2c_dbg(adap, "Transaction (pre): STS=%02x, TYP=%02x, " "CMD=%02x, ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTSTS), inb_p(SMBHSTTYP), inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0), inb_p(SMBHSTDAT1)); @@ -245,7 +245,7 @@ static int ali1535_transaction(struct i2c_adapter *adap) * 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, + i2c_info(adap, "Resetting entire SMB Bus to clear busy condition (%02x)\n", temp); outb_p(ALI1535_T_OUT, SMBHSTTYP); @@ -262,7 +262,7 @@ static int ali1535_transaction(struct i2c_adapter *adap) * 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, + i2c_err(adap, "SMBus reset failed! (0x%02x) - controller or " "device on bus is probably hung\n", temp); return -EBUSY; @@ -290,7 +290,7 @@ static int ali1535_transaction(struct i2c_adapter *adap) if (temp & ALI1535_STS_FAIL) { result = -EIO; - dev_dbg(&adap->dev, "Error: Failed bus transaction\n"); + i2c_dbg(adap, "Error: Failed bus transaction\n"); } /* Unfortunately the ALI SMB controller maps "no response" and "bus @@ -299,7 +299,7 @@ static int ali1535_transaction(struct i2c_adapter *adap) */ if (temp & ALI1535_STS_BUSERR) { result = -ENXIO; - dev_dbg(&adap->dev, + i2c_dbg(adap, "Error: no response or bus collision ADD=%02x\n", inb_p(SMBHSTADD)); } @@ -307,14 +307,14 @@ static int ali1535_transaction(struct i2c_adapter *adap) /* haven't ever seen this */ if (temp & ALI1535_STS_DEV) { result = -EIO; - dev_err(&adap->dev, "Error: device error\n"); + i2c_err(adap, "Error: device error\n"); } /* check to see if the "command complete" indication is set */ if (!(temp & ALI1535_STS_DONE)) result = -ETIMEDOUT; - dev_dbg(&adap->dev, "Transaction (post): STS=%02x, TYP=%02x, " + i2c_dbg(adap, "Transaction (post): STS=%02x, TYP=%02x, " "CMD=%02x, ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTSTS), inb_p(SMBHSTTYP), inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0), inb_p(SMBHSTDAT1)); @@ -352,7 +352,7 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr, temp = inb_p(SMBHSTSTS); } if (timeout >= MAX_TIMEOUT) - dev_warn(&adap->dev, "Idle wait Timeout! STS=0x%02x\n", temp); + i2c_warn(adap, "Idle wait Timeout! STS=0x%02x\n", temp); /* clear status register (clear-on-write) */ outb_p(0xFF, SMBHSTSTS); @@ -416,7 +416,7 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr, } break; default: - dev_warn(&adap->dev, "Unsupported transaction %d\n", size); + i2c_warn(adap, "Unsupported transaction %d\n", size); result = -EOPNOTSUPP; goto EXIT; } @@ -449,7 +449,7 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr, outb_p(inb_p(SMBHSTTYP) | ALI1535_BLOCK_CLR, SMBHSTTYP); 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
