Commit 9c0982d8 authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann

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: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9deee319
...@@ -2124,8 +2124,8 @@ int notrace __cci_control_port_by_device(struct device_node *dn, bool enable) ...@@ -2124,8 +2124,8 @@ int notrace __cci_control_port_by_device(struct device_node *dn, bool enable)
return -ENODEV; return -ENODEV;
port = __cci_ace_get_port(dn, ACE_LITE_PORT); port = __cci_ace_get_port(dn, ACE_LITE_PORT);
if (WARN_ONCE(port < 0, "node %s ACE lite port look-up failure\n", if (WARN_ONCE(port < 0, "node %pOF ACE lite port look-up failure\n",
dn->full_name)) dn))
return -ENODEV; return -ENODEV;
cci_port_control(port, enable); cci_port_control(port, enable);
return 0; return 0;
...@@ -2200,14 +2200,14 @@ static int cci_probe_ports(struct device_node *np) ...@@ -2200,14 +2200,14 @@ static int cci_probe_ports(struct device_node *np)
if (of_property_read_string(cp, "interface-type", if (of_property_read_string(cp, "interface-type",
&match_str)) { &match_str)) {
WARN(1, "node %s missing interface-type property\n", WARN(1, "node %pOF missing interface-type property\n",
cp->full_name); cp);
continue; continue;
} }
is_ace = strcmp(match_str, "ace") == 0; is_ace = strcmp(match_str, "ace") == 0;
if (!is_ace && strcmp(match_str, "ace-lite")) { if (!is_ace && strcmp(match_str, "ace-lite")) {
WARN(1, "node %s containing invalid interface-type property, skipping it\n", WARN(1, "node %pOF containing invalid interface-type property, skipping it\n",
cp->full_name); cp);
continue; continue;
} }
......
...@@ -156,8 +156,8 @@ static int __init weim_parse_dt(struct platform_device *pdev, ...@@ -156,8 +156,8 @@ static int __init weim_parse_dt(struct platform_device *pdev,
ret = weim_timing_setup(child, base, devtype); ret = weim_timing_setup(child, base, devtype);
if (ret) if (ret)
dev_warn(&pdev->dev, "%s set timing failed.\n", dev_warn(&pdev->dev, "%pOF set timing failed.\n",
child->full_name); child);
else else
have_child = 1; have_child = 1;
} }
...@@ -166,8 +166,8 @@ static int __init weim_parse_dt(struct platform_device *pdev, ...@@ -166,8 +166,8 @@ static int __init weim_parse_dt(struct platform_device *pdev,
ret = of_platform_default_populate(pdev->dev.of_node, ret = of_platform_default_populate(pdev->dev.of_node,
NULL, &pdev->dev); NULL, &pdev->dev);
if (ret) if (ret)
dev_err(&pdev->dev, "%s fail to create devices.\n", dev_err(&pdev->dev, "%pOF fail to create devices.\n",
pdev->dev.of_node->full_name); pdev->dev.of_node);
return ret; return ret;
} }
......
...@@ -556,20 +556,20 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb) ...@@ -556,20 +556,20 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
/* Runtime addresses for all slaves should be set first */ /* Runtime addresses for all slaves should be set first */
for_each_available_child_of_node(np, child) { for_each_available_child_of_node(np, child) {
dev_dbg(dev, "setting child %s runtime address\n", dev_dbg(dev, "setting child %pOF runtime address\n",
child->full_name); child);
ret = of_property_read_u32(child, "reg", &hwaddr); ret = of_property_read_u32(child, "reg", &hwaddr);
if (ret) { if (ret) {
dev_err(dev, "%s: invalid 'reg' property: %d\n", dev_err(dev, "%pOF: invalid 'reg' property: %d\n",
child->full_name, ret); child, ret);
continue; continue;
} }
rtaddr = sunxi_rsb_get_rtaddr(hwaddr); rtaddr = sunxi_rsb_get_rtaddr(hwaddr);
if (!rtaddr) { if (!rtaddr) {
dev_err(dev, "%s: unknown hardware device address\n", dev_err(dev, "%pOF: unknown hardware device address\n",
child->full_name); child);
continue; continue;
} }
...@@ -586,15 +586,15 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb) ...@@ -586,15 +586,15 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
/* send command */ /* send command */
ret = _sunxi_rsb_run_xfer(rsb); ret = _sunxi_rsb_run_xfer(rsb);
if (ret) if (ret)
dev_warn(dev, "%s: set runtime address failed: %d\n", dev_warn(dev, "%pOF: set runtime address failed: %d\n",
child->full_name, ret); child, ret);
} }
/* Then we start adding devices and probing them */ /* Then we start adding devices and probing them */
for_each_available_child_of_node(np, child) { for_each_available_child_of_node(np, child) {
struct sunxi_rsb_device *rdev; 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); ret = of_property_read_u32(child, "reg", &hwaddr);
if (ret) if (ret)
...@@ -606,8 +606,8 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb) ...@@ -606,8 +606,8 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
rdev = sunxi_rsb_device_create(rsb, child, hwaddr, rtaddr); rdev = sunxi_rsb_device_create(rsb, child, hwaddr, rtaddr);
if (IS_ERR(rdev)) if (IS_ERR(rdev))
dev_err(dev, "failed to add child device %s: %ld\n", dev_err(dev, "failed to add child device %pOF: %ld\n",
child->full_name, PTR_ERR(rdev)); child, PTR_ERR(rdev));
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment