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-mlxbf.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c index 8345f7e6385df64bcd3a82021df3f1e04524c6c5..78a7e893b572a682133b3cea200f571f1977ca1e 100644 --- a/drivers/i2c/busses/i2c-mlxbf.c +++ b/drivers/i2c/busses/i2c-mlxbf.c @@ -2045,28 +2045,28 @@ static s32 mlxbf_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, switch (size) { case I2C_SMBUS_QUICK: mlxbf_i2c_smbus_quick_command(&request, read); - dev_dbg(&adap->dev, "smbus quick, slave 0x%02x\n", addr); + i2c_dbg(adap, "smbus quick, slave 0x%02x\n", addr); break; case I2C_SMBUS_BYTE: mlxbf_i2c_smbus_byte_func(&request, read ? &data->byte : &command, read, pec); - dev_dbg(&adap->dev, "smbus %s byte, slave 0x%02x.\n", + i2c_dbg(adap, "smbus %s byte, slave 0x%02x.\n", str_read_write(read), addr); break; case I2C_SMBUS_BYTE_DATA: mlxbf_i2c_smbus_data_byte_func(&request, &command, &data->byte, read, pec); - dev_dbg(&adap->dev, "smbus %s byte data at 0x%02x, slave 0x%02x.\n", + i2c_dbg(adap, "smbus %s byte data at 0x%02x, slave 0x%02x.\n", str_read_write(read), command, addr); break; case I2C_SMBUS_WORD_DATA: mlxbf_i2c_smbus_data_word_func(&request, &command, (u8 *)&data->word, read, pec); - dev_dbg(&adap->dev, "smbus %s word data at 0x%02x, slave 0x%02x.\n", + i2c_dbg(adap, "smbus %s word data at 0x%02x, slave 0x%02x.\n", str_read_write(read), command, addr); break; @@ -2074,7 +2074,7 @@ static s32 mlxbf_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, byte_cnt = data->block[0]; mlxbf_i2c_smbus_i2c_block_func(&request, &command, data->block, &byte_cnt, read, pec); - dev_dbg(&adap->dev, "i2c %s block data, %d bytes at 0x%02x, slave 0x%02x.\n", + i2c_dbg(adap, "i2c %s block data, %d bytes at 0x%02x, slave 0x%02x.\n", str_read_write(read), byte_cnt, command, addr); break; @@ -2082,14 +2082,14 @@ static s32 mlxbf_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, byte_cnt = read ? I2C_SMBUS_BLOCK_MAX : data->block[0]; mlxbf_i2c_smbus_block_func(&request, &command, data->block, &byte_cnt, read, pec); - dev_dbg(&adap->dev, "smbus %s block data, %d bytes at 0x%02x, slave 0x%02x.\n", + i2c_dbg(adap, "smbus %s block data, %d bytes at 0x%02x, slave 0x%02x.\n", str_read_write(read), byte_cnt, command, addr); break; case I2C_FUNC_SMBUS_PROC_CALL: mlxbf_i2c_smbus_process_call_func(&request, &command, (u8 *)&data->word, pec); - dev_dbg(&adap->dev, "process call, wr/rd at 0x%02x, slave 0x%02x.\n", + i2c_dbg(adap, "process call, wr/rd at 0x%02x, slave 0x%02x.\n", command, addr); break; @@ -2098,13 +2098,12 @@ static s32 mlxbf_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, mlxbf_i2c_smbus_blk_process_call_func(&request, &command, data->block, &byte_cnt, pec); - dev_dbg(&adap->dev, "block process call, wr/rd %d bytes, slave 0x%02x.\n", + i2c_dbg(adap, "block process call, wr/rd %d bytes, slave 0x%02x.\n", byte_cnt, addr); break; default: - dev_dbg(&adap->dev, "Unsupported I2C/SMBus command %d\n", - size); + i2c_dbg(adap, "Unsupported I2C/SMBus command %d\n", size); return -EOPNOTSUPP; } -- 2.47.3
