[PATCH v2 09/13] i2c: powermac: use i2c_adapter-specific printk helpers
STALE199d
From: Bartosz Golaszewski <hidden>
Date: 2026-02-23 09:00:18
Also in:
linux-arm-kernel, linux-i2c, linux-media, linux-sunxi, lkml
Subsystem:
i2c subsystem, i2c subsystem host drivers, the rest · Maintainers:
Andi Shyti, Linus Torvalds
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 <redacted> --- drivers/i2c/busses/i2c-powermac.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index f99a2cc721a81dc328bc03ea88ff959cafe0f05a..fb5482655d6c5c617392e9ccd745433d5d828335 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c@@ -92,13 +92,13 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap, rc = pmac_i2c_open(bus, 0); if (rc) { - dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc); + i2c_err(adap, "Failed to open I2C, err %d\n", rc); return rc; } rc = pmac_i2c_setmode(bus, mode); if (rc) { - dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n", + i2c_err(adap, "Failed to set I2C mode %d, err %d\n", mode, rc); goto bail; }
@@ -106,11 +106,11 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap, rc = pmac_i2c_xfer(bus, addrdir, subsize, subaddr, buf, len); if (rc) { if (rc == -ENXIO) - dev_dbg(&adap->dev, + i2c_dbg(adap, "I2C transfer at 0x%02x failed, size %d, " "err %d\n", addrdir >> 1, size, rc); else - dev_err(&adap->dev, + i2c_err(adap, "I2C transfer at 0x%02x failed, size %d, " "err %d\n", addrdir >> 1, size, rc); goto bail;
@@ -145,23 +145,23 @@ static int i2c_powermac_xfer(struct i2c_adapter *adap, rc = pmac_i2c_open(bus, 0); if (rc) { - dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc); + i2c_err(adap, "Failed to open I2C, err %d\n", rc); return rc; } rc = pmac_i2c_setmode(bus, pmac_i2c_mode_std); if (rc) { - dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n", + i2c_err(adap, "Failed to set I2C mode %d, err %d\n", pmac_i2c_mode_std, rc); goto bail; } rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs->buf, msgs->len); if (rc < 0) { if (rc == -ENXIO) - dev_dbg(&adap->dev, "I2C %s 0x%02x failed, err %d\n", + i2c_dbg(adap, "I2C %s 0x%02x failed, err %d\n", addrdir & 1 ? "read from" : "write to", addrdir >> 1, rc); else - dev_err(&adap->dev, "I2C %s 0x%02x failed, err %d\n", + i2c_err(adap, "I2C %s 0x%02x failed, err %d\n", addrdir & 1 ? "read from" : "write to", addrdir >> 1, rc); }
@@ -219,7 +219,7 @@ static u32 i2c_powermac_get_addr(struct i2c_adapter *adap, else if (of_node_name_eq(node, "deq")) return 0x34; - dev_warn(&adap->dev, "No i2c address for %pOF\n", node); + i2c_warn(adap, "No i2c address for %pOF\n", node); return 0xffffffff; }
@@ -235,7 +235,7 @@ static void i2c_powermac_create_one(struct i2c_adapter *adap, info.addr = addr; newdev = i2c_new_client_device(adap, &info); if (IS_ERR(newdev)) - dev_err(&adap->dev, + i2c_err(adap, "i2c-powermac: Failure to register missing %s\n", type); }
@@ -299,7 +299,7 @@ static bool i2c_powermac_get_type(struct i2c_adapter *adap, } } - dev_err(&adap->dev, "i2c-powermac: modalias failure on %pOF\n", node); + i2c_err(adap, "i2c-powermac: modalias failure on %pOF\n", node); return false; }
@@ -331,7 +331,7 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap, if (!pmac_i2c_match_adapter(node, adap)) continue; - dev_dbg(&adap->dev, "i2c-powermac: register %pOF\n", node); + i2c_dbg(adap, "i2c-powermac: register %pOF\n", node); /* * Keep track of some device existence to handle
@@ -353,7 +353,7 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap, newdev = i2c_new_client_device(adap, &info); if (IS_ERR(newdev)) { - dev_err(&adap->dev, "i2c-powermac: Failure to register" + i2c_err(adap, "i2c-powermac: Failure to register" " %pOF\n", node); of_node_put(node); /* We do not dispose of the interrupt mapping on
--
2.47.3