forked from Minki/linux
bus: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
9deee31907
commit
9c0982d809
@ -2124,8 +2124,8 @@ int notrace __cci_control_port_by_device(struct device_node *dn, bool enable)
|
||||
return -ENODEV;
|
||||
|
||||
port = __cci_ace_get_port(dn, ACE_LITE_PORT);
|
||||
if (WARN_ONCE(port < 0, "node %s ACE lite port look-up failure\n",
|
||||
dn->full_name))
|
||||
if (WARN_ONCE(port < 0, "node %pOF ACE lite port look-up failure\n",
|
||||
dn))
|
||||
return -ENODEV;
|
||||
cci_port_control(port, enable);
|
||||
return 0;
|
||||
@ -2200,14 +2200,14 @@ static int cci_probe_ports(struct device_node *np)
|
||||
|
||||
if (of_property_read_string(cp, "interface-type",
|
||||
&match_str)) {
|
||||
WARN(1, "node %s missing interface-type property\n",
|
||||
cp->full_name);
|
||||
WARN(1, "node %pOF missing interface-type property\n",
|
||||
cp);
|
||||
continue;
|
||||
}
|
||||
is_ace = strcmp(match_str, "ace") == 0;
|
||||
if (!is_ace && strcmp(match_str, "ace-lite")) {
|
||||
WARN(1, "node %s containing invalid interface-type property, skipping it\n",
|
||||
cp->full_name);
|
||||
WARN(1, "node %pOF containing invalid interface-type property, skipping it\n",
|
||||
cp);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -156,8 +156,8 @@ static int __init weim_parse_dt(struct platform_device *pdev,
|
||||
|
||||
ret = weim_timing_setup(child, base, devtype);
|
||||
if (ret)
|
||||
dev_warn(&pdev->dev, "%s set timing failed.\n",
|
||||
child->full_name);
|
||||
dev_warn(&pdev->dev, "%pOF set timing failed.\n",
|
||||
child);
|
||||
else
|
||||
have_child = 1;
|
||||
}
|
||||
@ -166,8 +166,8 @@ static int __init weim_parse_dt(struct platform_device *pdev,
|
||||
ret = of_platform_default_populate(pdev->dev.of_node,
|
||||
NULL, &pdev->dev);
|
||||
if (ret)
|
||||
dev_err(&pdev->dev, "%s fail to create devices.\n",
|
||||
pdev->dev.of_node->full_name);
|
||||
dev_err(&pdev->dev, "%pOF fail to create devices.\n",
|
||||
pdev->dev.of_node);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -556,20 +556,20 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
|
||||
|
||||
/* Runtime addresses for all slaves should be set first */
|
||||
for_each_available_child_of_node(np, child) {
|
||||
dev_dbg(dev, "setting child %s runtime address\n",
|
||||
child->full_name);
|
||||
dev_dbg(dev, "setting child %pOF runtime address\n",
|
||||
child);
|
||||
|
||||
ret = of_property_read_u32(child, "reg", &hwaddr);
|
||||
if (ret) {
|
||||
dev_err(dev, "%s: invalid 'reg' property: %d\n",
|
||||
child->full_name, ret);
|
||||
dev_err(dev, "%pOF: invalid 'reg' property: %d\n",
|
||||
child, ret);
|
||||
continue;
|
||||
}
|
||||
|
||||
rtaddr = sunxi_rsb_get_rtaddr(hwaddr);
|
||||
if (!rtaddr) {
|
||||
dev_err(dev, "%s: unknown hardware device address\n",
|
||||
child->full_name);
|
||||
dev_err(dev, "%pOF: unknown hardware device address\n",
|
||||
child);
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -586,15 +586,15 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
|
||||
/* send command */
|
||||
ret = _sunxi_rsb_run_xfer(rsb);
|
||||
if (ret)
|
||||
dev_warn(dev, "%s: set runtime address failed: %d\n",
|
||||
child->full_name, ret);
|
||||
dev_warn(dev, "%pOF: set runtime address failed: %d\n",
|
||||
child, ret);
|
||||
}
|
||||
|
||||
/* Then we start adding devices and probing them */
|
||||
for_each_available_child_of_node(np, child) {
|
||||
struct sunxi_rsb_device *rdev;
|
||||
|
||||
dev_dbg(dev, "adding child %s\n", child->full_name);
|
||||
dev_dbg(dev, "adding child %pOF\n", child);
|
||||
|
||||
ret = of_property_read_u32(child, "reg", &hwaddr);
|
||||
if (ret)
|
||||
@ -606,8 +606,8 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
|
||||
|
||||
rdev = sunxi_rsb_device_create(rsb, child, hwaddr, rtaddr);
|
||||
if (IS_ERR(rdev))
|
||||
dev_err(dev, "failed to add child device %s: %ld\n",
|
||||
child->full_name, PTR_ERR(rdev));
|
||||
dev_err(dev, "failed to add child device %pOF: %ld\n",
|
||||
child, PTR_ERR(rdev));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user