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-amd756.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 3621c02f1cbabd8c5e9d8a4ae1494ada78726b15..629da0b8024b88cc4d51ea5e785147b462a1281c 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c @@ -99,14 +99,14 @@ static int amd756_transaction(struct i2c_adapter *adap) int result = 0; int timeout = 0; - dev_dbg(&adap->dev, "Transaction (pre): GS=%04x, GE=%04x, ADD=%04x, " + i2c_dbg(adap, "Transaction (pre): GS=%04x, GE=%04x, ADD=%04x, " "DAT=%04x\n", inw_p(SMB_GLOBAL_STATUS), inw_p(SMB_GLOBAL_ENABLE), inw_p(SMB_HOST_ADDRESS), inb_p(SMB_HOST_DATA)); /* Make sure the SMBus host is ready to start transmitting */ if ((temp = inw_p(SMB_GLOBAL_STATUS)) & (GS_HST_STS | GS_SMB_STS)) { - dev_dbg(&adap->dev, "SMBus busy (%04x). Waiting...\n", temp); + i2c_dbg(adap, "SMBus busy (%04x). Waiting...\n", temp); do { msleep(1); temp = inw_p(SMB_GLOBAL_STATUS); @@ -114,7 +114,7 @@ static int amd756_transaction(struct i2c_adapter *adap) (timeout++ < MAX_TIMEOUT)); /* If the SMBus is still busy, we give up */ if (timeout > MAX_TIMEOUT) { - dev_dbg(&adap->dev, "Busy wait timeout (%04x)\n", temp); + i2c_dbg(adap, "Busy wait timeout (%04x)\n", temp); goto abort; } timeout = 0; @@ -131,38 +131,38 @@ static int amd756_transaction(struct i2c_adapter *adap) /* If the SMBus is still busy, we give up */ if (timeout > MAX_TIMEOUT) { - dev_dbg(&adap->dev, "Completion timeout!\n"); + i2c_dbg(adap, "Completion timeout!\n"); goto abort; } if (temp & GS_PRERR_STS) { result = -ENXIO; - dev_dbg(&adap->dev, "SMBus Protocol error (no response)!\n"); + i2c_dbg(adap, "SMBus Protocol error (no response)!\n"); } if (temp & GS_COL_STS) { result = -EIO; - dev_warn(&adap->dev, "SMBus collision!\n"); + i2c_warn(adap, "SMBus collision!\n"); } if (temp & GS_TO_STS) { result = -ETIMEDOUT; - dev_dbg(&adap->dev, "SMBus protocol timeout!\n"); + i2c_dbg(adap, "SMBus protocol timeout!\n"); } if (temp & GS_HCYC_STS) - dev_dbg(&adap->dev, "SMBus protocol success!\n"); + i2c_dbg(adap, "SMBus protocol success!\n"); outw_p(GS_CLEAR_STS, SMB_GLOBAL_STATUS); #ifdef DEBUG if (((temp = inw_p(SMB_GLOBAL_STATUS)) & GS_CLEAR_STS) != 0x00) { - dev_dbg(&adap->dev, + i2c_dbg(adap, "Failed reset at end of transaction (%04x)\n", temp); } #endif - dev_dbg(&adap->dev, + i2c_dbg(adap, "Transaction (post): GS=%04x, GE=%04x, ADD=%04x, DAT=%04x\n", inw_p(SMB_GLOBAL_STATUS), inw_p(SMB_GLOBAL_ENABLE), inw_p(SMB_HOST_ADDRESS), inb_p(SMB_HOST_DATA)); @@ -170,7 +170,7 @@ static int amd756_transaction(struct i2c_adapter *adap) return result; abort: - dev_warn(&adap->dev, "Sending abort\n"); + i2c_warn(adap, "Sending abort\n"); outw_p(inw(SMB_GLOBAL_ENABLE) | GE_ABORT, SMB_GLOBAL_ENABLE); msleep(100); outw_p(GS_CLEAR_STS, SMB_GLOBAL_STATUS); @@ -233,7 +233,7 @@ static s32 amd756_access(struct i2c_adapter * adap, u16 addr, size = AMD756_BLOCK_DATA; break; default: - dev_warn(&adap->dev, "Unsupported transaction %d\n", size); + i2c_warn(adap, "Unsupported transaction %d\n", size); return -EOPNOTSUPP; } -- 2.47.3
