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-nforce2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index d58a308582e47650238312537d2d721261d3bca4..2fa6f1dbd27a92c2d67915775e588e4bab675d76 100644 --- a/drivers/i2c/busses/i2c-nforce2.c +++ b/drivers/i2c/busses/i2c-nforce2.c @@ -123,7 +123,7 @@ static void nforce2_abort(struct i2c_adapter *adap) int timeout = 0; unsigned char temp; - dev_dbg(&adap->dev, "Aborting current transaction\n"); + i2c_dbg(adap, "Aborting current transaction\n"); outb_p(NVIDIA_SMB_CTRL_ABORT, NVIDIA_SMB_CTRL); do { @@ -132,7 +132,7 @@ static void nforce2_abort(struct i2c_adapter *adap) } while (!(temp & NVIDIA_SMB_STATUS_ABRT_STS) && (timeout++ < MAX_TIMEOUT)); if (!(temp & NVIDIA_SMB_STATUS_ABRT_STS)) - dev_err(&adap->dev, "Can't reset the smbus\n"); + i2c_err(adap, "Can't reset the smbus\n"); outb_p(NVIDIA_SMB_STATUS_ABRT_STS, NVIDIA_SMB_STATUS_ABRT); } @@ -148,13 +148,13 @@ static int nforce2_check_status(struct i2c_adapter *adap) } while ((!temp) && (timeout++ < MAX_TIMEOUT)); if (timeout > MAX_TIMEOUT) { - dev_dbg(&adap->dev, "SMBus Timeout!\n"); + i2c_dbg(adap, "SMBus Timeout!\n"); if (smbus->can_abort) nforce2_abort(adap); return -ETIMEDOUT; } if (!(temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS)) { - dev_dbg(&adap->dev, "Transaction failed (0x%02x)!\n", temp); + i2c_dbg(adap, "Transaction failed (0x%02x)!\n", temp); return -EIO; } return 0; @@ -207,7 +207,7 @@ static s32 nforce2_access(struct i2c_adapter *adap, u16 addr, if (read_write == I2C_SMBUS_WRITE) { len = data->block[0]; if ((len == 0) || (len > I2C_SMBUS_BLOCK_MAX)) { - dev_err(&adap->dev, + i2c_err(adap, "Transaction failed (requested block size: %d)\n", len); return -EINVAL; @@ -221,7 +221,7 @@ static s32 nforce2_access(struct i2c_adapter *adap, u16 addr, break; default: - dev_err(&adap->dev, "Unsupported transaction %d\n", size); + i2c_err(adap, "Unsupported transaction %d\n", size); return -EOPNOTSUPP; } @@ -249,7 +249,7 @@ static s32 nforce2_access(struct i2c_adapter *adap, u16 addr, case I2C_SMBUS_BLOCK_DATA: len = inb_p(NVIDIA_SMB_BCNT); if ((len <= 0) || (len > I2C_SMBUS_BLOCK_MAX)) { - dev_err(&adap->dev, + i2c_err(adap, "Transaction failed (received block size: 0x%02x)\n", len); return -EPROTO; -- 2.47.3
