aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-07-18 17:43:29 -0400
committerArnd Bergmann <arnd@arndb.de>2017-08-16 15:32:36 -0400
commit37c342cba5ef1ccb51f88a4aa5c1e74f793750c7 (patch)
tree905a647524a2d5d4d3248c8f86fc152164b10914 /drivers
parent9c0982d809fd81cc63438926c465e5919fd97acd (diff)
soc: 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: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Matthias Brugger <matthias.bgg@gmail.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Cc: Scott Wood <oss@buserror.net> Cc: Qiang Zhao <qiang.zhao@nxp.com> Cc: Magnus Damm <magnus.damm@gmail.com> Cc: Kukjin Kim <kgene@kernel.org> Cc: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/soc/fsl/qbman/bman_ccsr.c10
-rw-r--r--drivers/soc/fsl/qbman/bman_portal.c8
-rw-r--r--drivers/soc/fsl/qbman/qman_ccsr.c12
-rw-r--r--drivers/soc/fsl/qbman/qman_portal.c11
-rw-r--r--drivers/soc/fsl/qe/gpio.c4
-rw-r--r--drivers/soc/mediatek/mtk-pmic-wrap.c4
-rw-r--r--drivers/soc/renesas/rcar-rst.c4
-rw-r--r--drivers/soc/renesas/rcar-sysc.c6
-rw-r--r--drivers/soc/samsung/pm_domains.c8
9 files changed, 31 insertions, 36 deletions
diff --git a/drivers/soc/fsl/qbman/bman_ccsr.c b/drivers/soc/fsl/qbman/bman_ccsr.c
index a8e8389a6894..eaa9585c7347 100644
--- a/drivers/soc/fsl/qbman/bman_ccsr.c
+++ b/drivers/soc/fsl/qbman/bman_ccsr.c
@@ -177,8 +177,8 @@ static int fsl_bman_probe(struct platform_device *pdev)
177 177
178 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 178 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
179 if (!res) { 179 if (!res) {
180 dev_err(dev, "Can't get %s property 'IORESOURCE_MEM'\n", 180 dev_err(dev, "Can't get %pOF property 'IORESOURCE_MEM'\n",
181 node->full_name); 181 node);
182 return -ENXIO; 182 return -ENXIO;
183 } 183 }
184 bm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res)); 184 bm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res));
@@ -205,14 +205,14 @@ static int fsl_bman_probe(struct platform_device *pdev)
205 205
206 err_irq = platform_get_irq(pdev, 0); 206 err_irq = platform_get_irq(pdev, 0);
207 if (err_irq <= 0) { 207 if (err_irq <= 0) {
208 dev_info(dev, "Can't get %s IRQ\n", node->full_name); 208 dev_info(dev, "Can't get %pOF IRQ\n", node);
209 return -ENODEV; 209 return -ENODEV;
210 } 210 }
211 ret = devm_request_irq(dev, err_irq, bman_isr, IRQF_SHARED, "bman-err", 211 ret = devm_request_irq(dev, err_irq, bman_isr, IRQF_SHARED, "bman-err",
212 dev); 212 dev);
213 if (ret) { 213 if (ret) {
214 dev_err(dev, "devm_request_irq() failed %d for '%s'\n", 214 dev_err(dev, "devm_request_irq() failed %d for '%pOF'\n",
215 ret, node->full_name); 215 ret, node);
216 return ret; 216 return ret;
217 } 217 }
218 /* Disable Buffer Pool State Change */ 218 /* Disable Buffer Pool State Change */
diff --git a/drivers/soc/fsl/qbman/bman_portal.c b/drivers/soc/fsl/qbman/bman_portal.c
index 8354d4dabdad..39b39c8f1399 100644
--- a/drivers/soc/fsl/qbman/bman_portal.c
+++ b/drivers/soc/fsl/qbman/bman_portal.c
@@ -103,16 +103,14 @@ static int bman_portal_probe(struct platform_device *pdev)
103 addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM, 103 addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM,
104 DPAA_PORTAL_CE); 104 DPAA_PORTAL_CE);
105 if (!addr_phys[0]) { 105 if (!addr_phys[0]) {
106 dev_err(dev, "Can't get %s property 'reg::CE'\n", 106 dev_err(dev, "Can't get %pOF property 'reg::CE'\n", node);
107 node->full_name);
108 return -ENXIO; 107 return -ENXIO;
109 } 108 }
110 109
111 addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM, 110 addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM,
112 DPAA_PORTAL_CI); 111 DPAA_PORTAL_CI);
113 if (!addr_phys[1]) { 112 if (!addr_phys[1]) {
114 dev_err(dev, "Can't get %s property 'reg::CI'\n", 113 dev_err(dev, "Can't get %pOF property 'reg::CI'\n", node);
115 node->full_name);
116 return -ENXIO; 114 return -ENXIO;
117 } 115 }
118 116
@@ -120,7 +118,7 @@ static int bman_portal_probe(struct platform_device *pdev)
120 118
121 irq = platform_get_irq(pdev, 0); 119 irq = platform_get_irq(pdev, 0);
122 if (irq <= 0) { 120 if (irq <= 0) {
123 dev_err(dev, "Can't get %s IRQ'\n", node->full_name); 121 dev_err(dev, "Can't get %pOF IRQ'\n", node);
124 return -ENXIO; 122 return -ENXIO;
125 } 123 }
126 pcfg->irq = irq; 124 pcfg->irq = irq;
diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c
index 90bc40c48675..835ce947ffca 100644
--- a/drivers/soc/fsl/qbman/qman_ccsr.c
+++ b/drivers/soc/fsl/qbman/qman_ccsr.c
@@ -695,8 +695,8 @@ static int fsl_qman_probe(struct platform_device *pdev)
695 695
696 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 696 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
697 if (!res) { 697 if (!res) {
698 dev_err(dev, "Can't get %s property 'IORESOURCE_MEM'\n", 698 dev_err(dev, "Can't get %pOF property 'IORESOURCE_MEM'\n",
699 node->full_name); 699 node);
700 return -ENXIO; 700 return -ENXIO;
701 } 701 }
702 qm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res)); 702 qm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res));
@@ -740,15 +740,15 @@ static int fsl_qman_probe(struct platform_device *pdev)
740 740
741 err_irq = platform_get_irq(pdev, 0); 741 err_irq = platform_get_irq(pdev, 0);
742 if (err_irq <= 0) { 742 if (err_irq <= 0) {
743 dev_info(dev, "Can't get %s property 'interrupts'\n", 743 dev_info(dev, "Can't get %pOF property 'interrupts'\n",
744 node->full_name); 744 node);
745 return -ENODEV; 745 return -ENODEV;
746 } 746 }
747 ret = devm_request_irq(dev, err_irq, qman_isr, IRQF_SHARED, "qman-err", 747 ret = devm_request_irq(dev, err_irq, qman_isr, IRQF_SHARED, "qman-err",
748 dev); 748 dev);
749 if (ret) { 749 if (ret) {
750 dev_err(dev, "devm_request_irq() failed %d for '%s'\n", 750 dev_err(dev, "devm_request_irq() failed %d for '%pOF'\n",
751 ret, node->full_name); 751 ret, node);
752 return ret; 752 return ret;
753 } 753 }
754 754
diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c
index adbaa30d3c5a..cbacdf4f98ed 100644
--- a/drivers/soc/fsl/qbman/qman_portal.c
+++ b/drivers/soc/fsl/qbman/qman_portal.c
@@ -237,30 +237,27 @@ static int qman_portal_probe(struct platform_device *pdev)
237 addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM, 237 addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM,
238 DPAA_PORTAL_CE); 238 DPAA_PORTAL_CE);
239 if (!addr_phys[0]) { 239 if (!addr_phys[0]) {
240 dev_err(dev, "Can't get %s property 'reg::CE'\n", 240 dev_err(dev, "Can't get %pOF property 'reg::CE'\n", node);
241 node->full_name);
242 return -ENXIO; 241 return -ENXIO;
243 } 242 }
244 243
245 addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM, 244 addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM,
246 DPAA_PORTAL_CI); 245 DPAA_PORTAL_CI);
247 if (!addr_phys[1]) { 246 if (!addr_phys[1]) {
248 dev_err(dev, "Can't get %s property 'reg::CI'\n", 247 dev_err(dev, "Can't get %pOF property 'reg::CI'\n", node);
249 node->full_name);
250 return -ENXIO; 248 return -ENXIO;
251 } 249 }
252 250
253 err = of_property_read_u32(node, "cell-index", &val); 251 err = of_property_read_u32(node, "cell-index", &val);
254 if (err) { 252 if (err) {
255 dev_err(dev, "Can't get %s property 'cell-index'\n", 253 dev_err(dev, "Can't get %pOF property 'cell-index'\n", node);
256 node->full_name);
257 return err; 254 return err;
258 } 255 }
259 pcfg->channel = val; 256 pcfg->channel = val;
260 pcfg->cpu = -1; 257 pcfg->cpu = -1;
261 irq = platform_get_irq(pdev, 0); 258 irq = platform_get_irq(pdev, 0);
262 if (irq <= 0) { 259 if (irq <= 0) {
263 dev_err(dev, "Can't get %s IRQ\n", node->full_name); 260 dev_err(dev, "Can't get %pOF IRQ\n", node);
264 return -ENXIO; 261 return -ENXIO;
265 } 262 }
266 pcfg->irq = irq; 263 pcfg->irq = irq;
diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
index 0aaf429f31d5..3b27075c21a7 100644
--- a/drivers/soc/fsl/qe/gpio.c
+++ b/drivers/soc/fsl/qe/gpio.c
@@ -304,8 +304,8 @@ static int __init qe_add_gpiochips(void)
304 goto err; 304 goto err;
305 continue; 305 continue;
306err: 306err:
307 pr_err("%s: registration failed with status %d\n", 307 pr_err("%pOF: registration failed with status %d\n",
308 np->full_name, ret); 308 np, ret);
309 kfree(qe_gc); 309 kfree(qe_gc);
310 /* try others anyway */ 310 /* try others anyway */
311 } 311 }
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index c80a04e1b2b1..af9768db42b4 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -1233,8 +1233,8 @@ static int pwrap_probe(struct platform_device *pdev)
1233 1233
1234 ret = of_platform_populate(np, NULL, NULL, wrp->dev); 1234 ret = of_platform_populate(np, NULL, NULL, wrp->dev);
1235 if (ret) { 1235 if (ret) {
1236 dev_dbg(wrp->dev, "failed to create child devices at %s\n", 1236 dev_dbg(wrp->dev, "failed to create child devices at %pOF\n",
1237 np->full_name); 1237 np);
1238 goto err_out2; 1238 goto err_out2;
1239 } 1239 }
1240 1240
diff --git a/drivers/soc/renesas/rcar-rst.c b/drivers/soc/renesas/rcar-rst.c
index a6d1c26d3167..78c40d5dd62b 100644
--- a/drivers/soc/renesas/rcar-rst.c
+++ b/drivers/soc/renesas/rcar-rst.c
@@ -61,7 +61,7 @@ static int __init rcar_rst_init(void)
61 61
62 base = of_iomap(np, 0); 62 base = of_iomap(np, 0);
63 if (!base) { 63 if (!base) {
64 pr_warn("%s: Cannot map regs\n", np->full_name); 64 pr_warn("%pOF: Cannot map regs\n", np);
65 error = -ENOMEM; 65 error = -ENOMEM;
66 goto out_put; 66 goto out_put;
67 } 67 }
@@ -70,7 +70,7 @@ static int __init rcar_rst_init(void)
70 cfg = match->data; 70 cfg = match->data;
71 saved_mode = ioread32(base + cfg->modemr); 71 saved_mode = ioread32(base + cfg->modemr);
72 72
73 pr_debug("%s: MODE = 0x%08x\n", np->full_name, saved_mode); 73 pr_debug("%pOF: MODE = 0x%08x\n", np, saved_mode);
74 74
75out_put: 75out_put:
76 of_node_put(np); 76 of_node_put(np);
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 7c8da3c90011..cd387347fa94 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -323,7 +323,7 @@ static int __init rcar_sysc_pd_init(void)
323 323
324 base = of_iomap(np, 0); 324 base = of_iomap(np, 0);
325 if (!base) { 325 if (!base) {
326 pr_warn("%s: Cannot map regs\n", np->full_name); 326 pr_warn("%pOF: Cannot map regs\n", np);
327 error = -ENOMEM; 327 error = -ENOMEM;
328 goto out_put; 328 goto out_put;
329 } 329 }
@@ -348,13 +348,13 @@ static int __init rcar_sysc_pd_init(void)
348 */ 348 */
349 syscimr = ioread32(base + SYSCIMR); 349 syscimr = ioread32(base + SYSCIMR);
350 syscimr |= syscier; 350 syscimr |= syscier;
351 pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr); 351 pr_debug("%pOF: syscimr = 0x%08x\n", np, syscimr);
352 iowrite32(syscimr, base + SYSCIMR); 352 iowrite32(syscimr, base + SYSCIMR);
353 353
354 /* 354 /*
355 * SYSC needs all interrupt sources enabled to control power. 355 * SYSC needs all interrupt sources enabled to control power.
356 */ 356 */
357 pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier); 357 pr_debug("%pOF: syscier = 0x%08x\n", np, syscier);
358 iowrite32(syscier, base + SYSCIER); 358 iowrite32(syscier, base + SYSCIER);
359 359
360 for (i = 0; i < info->num_areas; i++) { 360 for (i = 0; i < info->num_areas; i++) {
diff --git a/drivers/soc/samsung/pm_domains.c b/drivers/soc/samsung/pm_domains.c
index a6a5d807cc2b..c630eba32066 100644
--- a/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@ -237,11 +237,11 @@ no_clk:
237 continue; 237 continue;
238 238
239 if (of_genpd_add_subdomain(&parent, &child)) 239 if (of_genpd_add_subdomain(&parent, &child))
240 pr_warn("%s failed to add subdomain: %s\n", 240 pr_warn("%pOF failed to add subdomain: %pOF\n",
241 parent.np->full_name, child.np->full_name); 241 parent.np, child.np);
242 else 242 else
243 pr_info("%s has as child subdomain: %s.\n", 243 pr_info("%pOF has as child subdomain: %pOF.\n",
244 parent.np->full_name, child.np->full_name); 244 parent.np, child.np);
245 } 245 }
246 246
247 return 0; 247 return 0;