ARM: 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>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Javier Martinez Canillas <javier@osg.samsung.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index a3308ad1a02477d4fbe0fb196d940c53e44a6681..fda5579123a8b2ce7c09cd359421a7dfcfd48392 100644 (file)
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -101,8 +101,8 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu)
 
        ops = arm_cpuidle_get_ops(enable_method);
        if (!ops) {
-               pr_warn("%s: unsupported enable-method property: %s\n",
-                       dn->full_name, enable_method);
+               pr_warn("%pOF: unsupported enable-method property: %s\n",
+                       dn, enable_method);
                return -EOPNOTSUPP;
        }
 

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index f676febbb2706caaaa2856691032e415b4aa8d46..ecaa68dd1af52c9e1afd994978d70ddad7400b75 100644 (file)
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -95,7 +95,7 @@ void __init arm_dt_init_cpu_maps(void)
                if (of_node_cmp(cpu->type, "cpu"))
                        continue;
 
-               pr_debug(" * %s...\n", cpu->full_name);
+               pr_debug(" * %pOF...\n", cpu);
                /*
                 * A device tree containing CPU nodes with missing "reg"
                 * properties is considered invalid to build the
@@ -103,8 +103,7 @@ void __init arm_dt_init_cpu_maps(void)
                 */
                cell = of_get_property(cpu, "reg", &prop_bytes);
                if (!cell || prop_bytes < sizeof(*cell)) {
-                       pr_debug(" * %s missing reg property\n",
-                                    cpu->full_name);
+                       pr_debug(" * %pOF missing reg property\n", cpu);
                        of_node_put(cpu);
                        return;
                }

diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index bf949a763dbe5b1b38b0e75ea24e62b051570d64..24ac3cab411d94a186390aa1fedb16b53e1d3a73 100644 (file)
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -127,8 +127,7 @@ static void __init parse_dt_topology(void)
 
                rate = of_get_property(cn, "clock-frequency", &len);
                if (!rate || len != 4) {
-                       pr_err("%s missing clock-frequency property\n",
-                               cn->full_name);
+                       pr_err("%pOF missing clock-frequency property\n", cn);
                        continue;
                }
 

diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index 748cfb8d521247c2073b8cc064d963c1f7ab9eeb..b529ba04ed16656aeefc80eb5a4bb95119b6753d 100644 (file)
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -187,21 +187,20 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
        struct irq_domain *parent_domain, *domain;
 
        if (!parent) {
-               pr_err("%s: no parent, giving up\n", node->full_name);
+               pr_err("%pOF: no parent, giving up\n", node);
                return -ENODEV;
        }
 
        parent_domain = irq_find_host(parent);
        if (!parent_domain) {
-               pr_err("%s: unable to obtain parent domain\n", node->full_name);
+               pr_err("%pOF: unable to obtain parent domain\n", node);
                return -ENXIO;
        }
 
        pmu_base_addr = of_iomap(node, 0);
 
        if (!pmu_base_addr) {
-               pr_err("%s: failed to find exynos pmu register\n",
-                      node->full_name);
+               pr_err("%pOF: failed to find exynos pmu register\n", node);
                return -ENOMEM;
        }
 

diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 93f584ba0130eb480b001d98946d9981da19d34c..de535cb679b36d58d6cb88106656e1e260c490c0 100644 (file)
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -224,13 +224,13 @@ static int __init imx_gpc_init(struct device_node *node,
        int i;
 
        if (!parent) {
-               pr_err("%s: no parent, giving up\n", node->full_name);
+               pr_err("%pOF: no parent, giving up\n", node);
                return -ENODEV;
        }
 
        parent_domain = irq_find_host(parent);
        if (!parent_domain) {
-               pr_err("%s: unable to obtain parent domain\n", node->full_name);
+               pr_err("%pOF: unable to obtain parent domain\n", node);
                return -ENXIO;
        }
 

diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index 7d9f2fd9e450512ebd798eaa56ba6841b690fec4..0aa88105d46e5423c1d98d29ca0f65ab7968f143 100644 (file)
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
@@ -107,8 +107,7 @@ static void __init kirkwood_dt_eth_fixup(void)
                clk_prepare_enable(clk);
 
                /* store MAC address register contents in local-mac-address */
-               pr_err(FW_INFO "%s: local-mac-address is not set\n",
-                      np->full_name);
+               pr_err(FW_INFO "%pOF: local-mac-address is not set\n", np);
 
                pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
                if (!pmac)

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index 33ed5d53fa459d718d7fac0690846f50f8c1a144..4bb6751864a50e046e74c0952ad75571e1d979d0 100644 (file)
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -522,13 +522,13 @@ static int __init wakeupgen_init(struct device_node *node,
        u32 val;
 
        if (!parent) {
-               pr_err("%s: no parent, giving up\n", node->full_name);
+               pr_err("%pOF: no parent, giving up\n", node);
                return -ENODEV;
        }
 
        parent_domain = irq_find_host(parent);
        if (!parent_domain) {
-               pr_err("%s: unable to obtain parent domain\n", node->full_name);
+               pr_err("%pOF: unable to obtain parent domain\n", node);
                return -ENXIO;
        }
        /* Not supported on OMAP4 ES1.0 silicon */

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 3b47ded5fa0cb768617aea1d73429951ac061eaa..2dbd63239c5486fcba38476ed00f4c208448e899 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2417,8 +2417,8 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
                if (mem)
                        pr_err("omap_hwmod: %s: Could not ioremap\n", oh->name);
                else
-                       pr_err("omap_hwmod: %s: Missing dt reg%i for %s\n",
-                              oh->name, index, np->full_name);
+                       pr_err("omap_hwmod: %s: Missing dt reg%i for %pOF\n",
+                              oh->name, index, np);
                return -ENXIO;
        }
 

diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c
index 3abafdbdd7f4a24d7afed4aa53f196aab838ac92..2b5b0e43d657c97f3c98de7cd11f24eeb8e5c6e7 100644 (file)
--- a/arch/arm/mach-rockchip/platsmp.c
+++ b/arch/arm/mach-rockchip/platsmp.c
@@ -182,8 +182,8 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node)
 
        ret = of_address_to_resource(node, 0, &res);
        if (ret < 0) {
-               pr_err("%s: could not get address for node %s\n",
-                      __func__, node->full_name);
+               pr_err("%s: could not get address for node %pOF\n",
+                      __func__, node);
                return ret;
        }
 

diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index 699429f28b737e9e7ad7105f7809fdb34f200e41..3a4ed4c33a68e51e0f213c9c6407a618eb4c4507 100644 (file)
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -195,8 +195,7 @@ static void __init add_special_pd(struct device_node *np, enum pd_types type)
                return;
        }
 
-       pr_debug("Special PM domain %s type %d for %s\n", pd->name, type,
-                np->full_name);
+       pr_debug("Special PM domain %s type %d for %pOF\n", pd->name, type, np);
 
        special_pds[num_special_pds].pd = pd;
        special_pds[num_special_pds].type = type;
@@ -331,13 +330,13 @@ static int __init rmobile_init_pm_domains(void)
        for_each_compatible_node(np, NULL, "renesas,sysc-rmobile") {
                base = of_iomap(np, 0);
                if (!base) {
-                       pr_warn("%s cannot map reg 0\n", np->full_name);
+                       pr_warn("%pOF cannot map reg 0\n", np);
                        continue;
                }
 
                pmd = of_get_child_by_name(np, "pm-domains");
                if (!pmd) {
-                       pr_warn("%s lacks pm-domains node\n", np->full_name);
+                       pr_warn("%pOF lacks pm-domains node\n", np);
                        continue;
                }