AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

i2c: Convert to using %pOFn instead of device_node.name

Browse Source 
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Reviewed-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Rob Herring 2018-09-28 17:49:47 -05:00 committed by Wolfram Sang
parent e1eba2ea54
commit 49d54abee9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/i2c/busses/i2c-powermac.c
View File

@ -388,9 +388,8 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap,
static int i2c_powermac_probe(struct platform_device *dev) static int i2c_powermac_probe(struct platform_device *dev)
{ {
struct pmac_i2c_bus *bus = dev_get_platdata(&dev->dev); struct pmac_i2c_bus *bus = dev_get_platdata(&dev->dev);
struct device_node *parent = NULL; struct device_node *parent;
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
const char *basename;
int rc; int rc;
if (bus == NULL) 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)); parent = of_get_parent(pmac_i2c_get_controller(bus));
if (parent == NULL) if (parent == NULL)
return -EINVAL; return -EINVAL;
basename = parent->name; snprintf(adapter->name, sizeof(adapter->name), "%pOFn %d",
parent,
pmac_i2c_get_channel(bus));
of_node_put(parent);
break; break;
case pmac_i2c_bus_pmu: case pmac_i2c_bus_pmu:
basename = "pmu"; snprintf(adapter->name, sizeof(adapter->name), "pmu %d",
pmac_i2c_get_channel(bus));
break; break;
case pmac_i2c_bus_smu: case pmac_i2c_bus_smu:
/* This is not what we used to do but I'm fixing drivers at /* This is not what we used to do but I'm fixing drivers at
* the same time as this change * the same time as this change
*/ */
basename = "smu"; snprintf(adapter->name, sizeof(adapter->name), "smu %d",
pmac_i2c_get_channel(bus));
break; break;
default: default:
return -EINVAL; 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); platform_set_drvdata(dev, adapter);
adapter->algo = &i2c_powermac_algorithm; adapter->algo = &i2c_powermac_algorithm;

4
drivers/i2c/muxes/i2c-mux-gpmux.c
View File

@ -120,8 +120,8 @@ static int i2c_mux_probe(struct platform_device *pdev)
ret = of_property_read_u32(child, "reg", &chan); ret = of_property_read_u32(child, "reg", &chan);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "no reg property for node '%s'\n", dev_err(dev, "no reg property for node '%pOFn'\n",
child->name); child);
goto err_children; goto err_children;
} }