i2c: Convert to using %pOFn instead of device_node.name
Subsystems (3)
PATCH v2 1/1 i2c: Convert to using %pOFn instead of device_node.name
In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Peter Rosin <[email protected]>
Signed-off-by Rob Herring <[email protected]>
---
v2:
- Remove initialization of parent
drivers/i2c/busses/i2c-powermac.c | 17 +++++++++-------- drivers/i2c/muxes/i2c-mux-gpmux.c | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-powermac.c +9 -8
@@ -388,9 +388,8 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap,static int i2c_powermac_probe (struct platform_device *dev) {struct pmac_i2c_bus *bus =dev_get_platdata (&dev->dev); -struct device_node *parent =NULL ; +struct device_node *parent;struct i2c_adapter *adapter; -const char *basename;int rc;if (bus ==NULL )
@@ -407,23 +406,25 @@ static int i2c_powermac_probe(struct platform_device *dev) parent =of_get_parent (pmac_i2c_get_controller (bus));if (parent ==NULL )return -EINVAL ; - basename = parent->name; +snprintf (adapter->name,sizeof (adapter->name),"%pOFn %d" , + parent, +pmac_i2c_get_channel (bus)); +of_node_put (parent);break ;case pmac_i2c_bus_pmu: - basename ="pmu" ; +snprintf (adapter->name,sizeof (adapter->name),"pmu %d" , +pmac_i2c_get_channel (bus));break ;case pmac_i2c_bus_smu:/* This is not what we used to do but I'm fixing drivers at * the same time as this change */ - basename ="smu" ; +snprintf (adapter->name,sizeof (adapter->name),"smu %d" , +pmac_i2c_get_channel (bus));break ;default :return -EINVAL ; } -snprintf (adapter->name,sizeof (adapter->name),"%s %d" , basename, -pmac_i2c_get_channel (bus)); -of_node_put (parent);platform_set_drvdata (dev, adapter); adapter->algo = &i2c_powermac_algorithm;
drivers/i2c/muxes/i2c-mux-gpmux.c +2 -2
@@ -120,8 +120,8 @@ static int i2c_mux_probe(struct platform_device *pdev) ret =of_property_read_u32 (child,"reg" , &chan);if (ret <0 ) { -dev_err (dev,"no reg property for node '%s'\n" , - child->name); +dev_err (dev,"no reg property for node '%pOFn'\n" , + child); goto err_children; }
Signature · 1 line
2.17.1
Wolfram Sang
AppliedQuoted 10 lines · Rob Herring
In preparation to remove the node name pointer from struct
device_node, convert printf users to use the %pOFn format specifier.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Michael Ellerman <[email protected]>Cc Peter Rosin <[email protected]>Signed-off-by Rob Herring <[email protected]>
Applied to for-next (with Peter's tag from v1), thanks!