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>

diff --git a/drivers/soc/fsl/qbman/bman_ccsr.c b/drivers/soc/fsl/qbman/bman_ccsr.c
index a8e8389a6894fbd5c277f9cc87f10de413d210df..eaa9585c7347518f3054e6b176b9521d05e7c01a 100644 (file)
--- 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)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
-               dev_err(dev, "Can't get %s property 'IORESOURCE_MEM'\n",
-                       node->full_name);
+               dev_err(dev, "Can't get %pOF property 'IORESOURCE_MEM'\n",
+                       node);
                return -ENXIO;
        }
        bm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res));
@@ -205,14 +205,14 @@ static int fsl_bman_probe(struct platform_device *pdev)
 
        err_irq = platform_get_irq(pdev, 0);
        if (err_irq <= 0) {
-               dev_info(dev, "Can't get %s IRQ\n", node->full_name);
+               dev_info(dev, "Can't get %pOF IRQ\n", node);
                return -ENODEV;
        }
        ret = devm_request_irq(dev, err_irq, bman_isr, IRQF_SHARED, "bman-err",
                               dev);
        if (ret)  {
-               dev_err(dev, "devm_request_irq() failed %d for '%s'\n",
-                       ret, node->full_name);
+               dev_err(dev, "devm_request_irq() failed %d for '%pOF'\n",
+                       ret, node);
                return ret;
        }
        /* Disable Buffer Pool State Change */

diff --git a/drivers/soc/fsl/qbman/bman_portal.c b/drivers/soc/fsl/qbman/bman_portal.c
index 8354d4dabdadf50dbf685738a61db4e98f4176f2..39b39c8f1399b8d12cfb0a569b6f051ece995f26 100644 (file)
--- 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)
        addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM,
                                             DPAA_PORTAL_CE);
        if (!addr_phys[0]) {
-               dev_err(dev, "Can't get %s property 'reg::CE'\n",
-                       node->full_name);
+               dev_err(dev, "Can't get %pOF property 'reg::CE'\n", node);
                return -ENXIO;
        }
 
        addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM,
                                             DPAA_PORTAL_CI);
        if (!addr_phys[1]) {
-               dev_err(dev, "Can't get %s property 'reg::CI'\n",
-                       node->full_name);
+               dev_err(dev, "Can't get %pOF property 'reg::CI'\n", node);
                return -ENXIO;
        }
 
@@ -120,7 +118,7 @@ static int bman_portal_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
-               dev_err(dev, "Can't get %s IRQ'\n", node->full_name);
+               dev_err(dev, "Can't get %pOF IRQ'\n", node);
                return -ENXIO;
        }
        pcfg->irq = irq;

diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c
index 90bc40c48675484b03d48a6fba743b7b2719945e..835ce947ffca599b0fcb013202b6608a7e889732 100644 (file)
--- 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)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
-               dev_err(dev, "Can't get %s property 'IORESOURCE_MEM'\n",
-                       node->full_name);
+               dev_err(dev, "Can't get %pOF property 'IORESOURCE_MEM'\n",
+                       node);
                return -ENXIO;
        }
        qm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res));
@@ -740,15 +740,15 @@ static int fsl_qman_probe(struct platform_device *pdev)
 
        err_irq = platform_get_irq(pdev, 0);
        if (err_irq <= 0) {
-               dev_info(dev, "Can't get %s property 'interrupts'\n",
-                        node->full_name);
+               dev_info(dev, "Can't get %pOF property 'interrupts'\n",
+                        node);
                return -ENODEV;
        }
        ret = devm_request_irq(dev, err_irq, qman_isr, IRQF_SHARED, "qman-err",
                               dev);
        if (ret)  {
-               dev_err(dev, "devm_request_irq() failed %d for '%s'\n",
-                       ret, node->full_name);
+               dev_err(dev, "devm_request_irq() failed %d for '%pOF'\n",
+                       ret, node);
                return ret;
        }
 

diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c
index adbaa30d3c5ad12aadf5bfa3c01829c392657f1a..cbacdf4f98edaf63bd0c9c80e3c5c8c750464153 100644 (file)
--- 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)
        addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM,
                                             DPAA_PORTAL_CE);
        if (!addr_phys[0]) {
-               dev_err(dev, "Can't get %s property 'reg::CE'\n",
-                       node->full_name);
+               dev_err(dev, "Can't get %pOF property 'reg::CE'\n", node);
                return -ENXIO;
        }
 
        addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM,
                                             DPAA_PORTAL_CI);
        if (!addr_phys[1]) {
-               dev_err(dev, "Can't get %s property 'reg::CI'\n",
-                       node->full_name);
+               dev_err(dev, "Can't get %pOF property 'reg::CI'\n", node);
                return -ENXIO;
        }
 
        err = of_property_read_u32(node, "cell-index", &val);
        if (err) {
-               dev_err(dev, "Can't get %s property 'cell-index'\n",
-                       node->full_name);
+               dev_err(dev, "Can't get %pOF property 'cell-index'\n", node);
                return err;
        }
        pcfg->channel = val;
        pcfg->cpu = -1;
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
-               dev_err(dev, "Can't get %s IRQ\n", node->full_name);
+               dev_err(dev, "Can't get %pOF IRQ\n", node);
                return -ENXIO;
        }
        pcfg->irq = irq;

diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
index 0aaf429f31d571f569fe0916b52d10cf3dadfd49..3b27075c21a7f41e6fdd2cdd591cac2da8713600 100644 (file)
--- 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)
                        goto err;
                continue;
 err:
-               pr_err("%s: registration failed with status %d\n",
-                      np->full_name, ret);
+               pr_err("%pOF: registration failed with status %d\n",
+                      np, ret);
                kfree(qe_gc);
                /* try others anyway */
        }

diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index c80a04e1b2b16f83c60759b74f26fa9ad44727e4..af9768db42b42adedf7f1d0a9a93d4e51f4cdb79 100644 (file)
--- 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)
 
        ret = of_platform_populate(np, NULL, NULL, wrp->dev);
        if (ret) {
-               dev_dbg(wrp->dev, "failed to create child devices at %s\n",
-                               np->full_name);
+               dev_dbg(wrp->dev, "failed to create child devices at %pOF\n",
+                               np);
                goto err_out2;
        }
 

diff --git a/drivers/soc/renesas/rcar-rst.c b/drivers/soc/renesas/rcar-rst.c
index a6d1c26d31675cf36ebc311a17a993704e0af688..78c40d5dd62b0a3000451bbeec8bdc075ffed93f 100644 (file)
--- 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)
 
        base = of_iomap(np, 0);
        if (!base) {
-               pr_warn("%s: Cannot map regs\n", np->full_name);
+               pr_warn("%pOF: Cannot map regs\n", np);
                error = -ENOMEM;
                goto out_put;
        }
@@ -70,7 +70,7 @@ static int __init rcar_rst_init(void)
        cfg = match->data;
        saved_mode = ioread32(base + cfg->modemr);
 
-       pr_debug("%s: MODE = 0x%08x\n", np->full_name, saved_mode);
+       pr_debug("%pOF: MODE = 0x%08x\n", np, saved_mode);
 
 out_put:
        of_node_put(np);

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 7c8da3c90011422fdec0404fc97a6b5c36949be5..cd387347fa946ac0a92c39206b5fdc7f9a686c7a 100644 (file)
--- 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)
 
        base = of_iomap(np, 0);
        if (!base) {
-               pr_warn("%s: Cannot map regs\n", np->full_name);
+               pr_warn("%pOF: Cannot map regs\n", np);
                error = -ENOMEM;
                goto out_put;
        }
@@ -348,13 +348,13 @@ static int __init rcar_sysc_pd_init(void)
         */
        syscimr = ioread32(base + SYSCIMR);
        syscimr |= syscier;
-       pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr);
+       pr_debug("%pOF: syscimr = 0x%08x\n", np, syscimr);
        iowrite32(syscimr, base + SYSCIMR);
 
        /*
         * SYSC needs all interrupt sources enabled to control power.
         */
-       pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier);
+       pr_debug("%pOF: syscier = 0x%08x\n", np, syscier);
        iowrite32(syscier, base + SYSCIER);
 
        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 a6a5d807cc2bae5a1b2cc4fbbc7c39136fe12e20..c630eba32066c3398d5eecd529c9734d008f9833 100644 (file)
--- a/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@ -237,11 +237,11 @@ no_clk:
                        continue;
 
                if (of_genpd_add_subdomain(&parent, &child))
-                       pr_warn("%s failed to add subdomain: %s\n",
-                               parent.np->full_name, child.np->full_name);
+                       pr_warn("%pOF failed to add subdomain: %pOF\n",
+                               parent.np, child.np);
                else
-                       pr_info("%s has as child subdomain: %s.\n",
-                               parent.np->full_name, child.np->full_name);
+                       pr_info("%pOF has as child subdomain: %pOF.\n",
+                               parent.np, child.np);
        }
 
        return 0;