summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-07-18 17:42:51 -0400
committerArnd Bergmann <arnd@arndb.de>2017-08-16 11:21:40 -0400
commit9c0982d809fd81cc63438926c465e5919fd97acd (patch)
treeb8ea60ac883907a9740142d2049d1b699b13fb7e
parent9deee319072286142ea23e9d3b0d789a216ffe20 (diff)
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>
-rw-r--r--drivers/bus/arm-cci.c12
-rw-r--r--drivers/bus/imx-weim.c8
-rw-r--r--drivers/bus/sunxi-rsb.c22
3 files changed, 21 insertions, 21 deletions
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index c49da15d9790..3c29d36702a8 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -2124,8 +2124,8 @@ int notrace __cci_control_port_by_device(struct device_node *dn, bool enable)
2124 return -ENODEV; 2124 return -ENODEV;
2125 2125
2126 port = __cci_ace_get_port(dn, ACE_LITE_PORT); 2126 port = __cci_ace_get_port(dn, ACE_LITE_PORT);
2127 if (WARN_ONCE(port < 0, "node %s ACE lite port look-up failure\n", 2127 if (WARN_ONCE(port < 0, "node %pOF ACE lite port look-up failure\n",
2128 dn->full_name)) 2128 dn))
2129 return -ENODEV; 2129 return -ENODEV;
2130 cci_port_control(port, enable); 2130 cci_port_control(port, enable);
2131 return 0; 2131 return 0;
@@ -2200,14 +2200,14 @@ static int cci_probe_ports(struct device_node *np)
2200 2200
2201 if (of_property_read_string(cp, "interface-type", 2201 if (of_property_read_string(cp, "interface-type",
2202 &match_str)) { 2202 &match_str)) {
2203 WARN(1, "node %s missing interface-type property\n", 2203 WARN(1, "node %pOF missing interface-type property\n",
2204 cp->full_name); 2204 cp);
2205 continue; 2205 continue;
2206 } 2206 }
2207 is_ace = strcmp(match_str, "ace") == 0; 2207 is_ace = strcmp(match_str, "ace") == 0;
2208 if (!is_ace && strcmp(match_str, "ace-lite")) { 2208 if (!is_ace && strcmp(match_str, "ace-lite")) {
2209 WARN(1, "node %s containing invalid interface-type property, skipping it\n", 2209 WARN(1, "node %pOF containing invalid interface-type property, skipping it\n",
2210 cp->full_name); 2210 cp);
2211 continue; 2211 continue;
2212 } 2212 }
2213 2213
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index 4bd361d64270..3d56ebcda720 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -156,8 +156,8 @@ static int __init weim_parse_dt(struct platform_device *pdev,
156 156
157 ret = weim_timing_setup(child, base, devtype); 157 ret = weim_timing_setup(child, base, devtype);
158 if (ret) 158 if (ret)
159 dev_warn(&pdev->dev, "%s set timing failed.\n", 159 dev_warn(&pdev->dev, "%pOF set timing failed.\n",
160 child->full_name); 160 child);
161 else 161 else
162 have_child = 1; 162 have_child = 1;
163 } 163 }
@@ -166,8 +166,8 @@ static int __init weim_parse_dt(struct platform_device *pdev,
166 ret = of_platform_default_populate(pdev->dev.of_node, 166 ret = of_platform_default_populate(pdev->dev.of_node,
167 NULL, &pdev->dev); 167 NULL, &pdev->dev);
168 if (ret) 168 if (ret)
169 dev_err(&pdev->dev, "%s fail to create devices.\n", 169 dev_err(&pdev->dev, "%pOF fail to create devices.\n",
170 pdev->dev.of_node->full_name); 170 pdev->dev.of_node);
171 return ret; 171 return ret;
172} 172}
173 173
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c
index 795c9d9c96a6..328ca93781cf 100644
--- a/drivers/bus/sunxi-rsb.c
+++ b/drivers/bus/sunxi-rsb.c
@@ -556,20 +556,20 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
556 556
557 /* Runtime addresses for all slaves should be set first */ 557 /* Runtime addresses for all slaves should be set first */
558 for_each_available_child_of_node(np, child) { 558 for_each_available_child_of_node(np, child) {
559 dev_dbg(dev, "setting child %s runtime address\n", 559 dev_dbg(dev, "setting child %pOF runtime address\n",
560 child->full_name); 560 child);
561 561
562 ret = of_property_read_u32(child, "reg", &hwaddr); 562 ret = of_property_read_u32(child, "reg", &hwaddr);
563 if (ret) { 563 if (ret) {
564 dev_err(dev, "%s: invalid 'reg' property: %d\n", 564 dev_err(dev, "%pOF: invalid 'reg' property: %d\n",
565 child->full_name, ret); 565 child, ret);
566 continue; 566 continue;
567 } 567 }
568 568
569 rtaddr = sunxi_rsb_get_rtaddr(hwaddr); 569 rtaddr = sunxi_rsb_get_rtaddr(hwaddr);
570 if (!rtaddr) { 570 if (!rtaddr) {
571 dev_err(dev, "%s: unknown hardware device address\n", 571 dev_err(dev, "%pOF: unknown hardware device address\n",
572 child->full_name); 572 child);
573 continue; 573 continue;
574 } 574 }
575 575
@@ -586,15 +586,15 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
586 /* send command */ 586 /* send command */
587 ret = _sunxi_rsb_run_xfer(rsb); 587 ret = _sunxi_rsb_run_xfer(rsb);
588 if (ret) 588 if (ret)
589 dev_warn(dev, "%s: set runtime address failed: %d\n", 589 dev_warn(dev, "%pOF: set runtime address failed: %d\n",
590 child->full_name, ret); 590 child, ret);
591 } 591 }
592 592
593 /* Then we start adding devices and probing them */ 593 /* Then we start adding devices and probing them */
594 for_each_available_child_of_node(np, child) { 594 for_each_available_child_of_node(np, child) {
595 struct sunxi_rsb_device *rdev; 595 struct sunxi_rsb_device *rdev;
596 596
597 dev_dbg(dev, "adding child %s\n", child->full_name); 597 dev_dbg(dev, "adding child %pOF\n", child);
598 598
599 ret = of_property_read_u32(child, "reg", &hwaddr); 599 ret = of_property_read_u32(child, "reg", &hwaddr);
600 if (ret) 600 if (ret)
@@ -606,8 +606,8 @@ static int of_rsb_register_devices(struct sunxi_rsb *rsb)
606 606
607 rdev = sunxi_rsb_device_create(rsb, child, hwaddr, rtaddr); 607 rdev = sunxi_rsb_device_create(rsb, child, hwaddr, rtaddr);
608 if (IS_ERR(rdev)) 608 if (IS_ERR(rdev))
609 dev_err(dev, "failed to add child device %s: %ld\n", 609 dev_err(dev, "failed to add child device %pOF: %ld\n",
610 child->full_name, PTR_ERR(rdev)); 610 child, PTR_ERR(rdev));
611 } 611 }
612 612
613 return 0; 613 return 0;