clocksource: 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>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c
index c4e1c2e6046fa1c82bbca793e0ec17a9f4f71291..6a8d9838ce33b28a97bba302bfdd304a685466d7 100644 (file)
--- a/drivers/clocksource/tango_xtal.c
+++ b/drivers/clocksource/tango_xtal.c
@@ -26,13 +26,13 @@ static int __init tango_clocksource_init(struct device_node *np)
 
        xtal_in_cnt = of_iomap(np, 0);
        if (xtal_in_cnt == NULL) {
-               pr_err("%s: invalid address\n", np->full_name);
+               pr_err("%pOF: invalid address\n", np);
                return -ENXIO;
        }
 
        clk = of_clk_get(np, 0);
        if (IS_ERR(clk)) {
-               pr_err("%s: invalid clock\n", np->full_name);
+               pr_err("%pOF: invalid clock\n", np);
                return PTR_ERR(clk);
        }
 
@@ -43,7 +43,7 @@ static int __init tango_clocksource_init(struct device_node *np)
        ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350,
                                    32, clocksource_mmio_readl_up);
        if (ret) {
-               pr_err("%s: registration failed\n", np->full_name);
+               pr_err("%pOF: registration failed\n", np);
                return ret;
        }
 

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index d509b500a7b5f8565514352a0313cb4704976042..64e00dd41e6f722f565cd1316e72c1e75304f308 100644 (file)
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -52,7 +52,7 @@ static __init int timer_irq_init(struct device_node *np,
                of_irq->irq = irq_of_parse_and_map(np, of_irq->index);
        }
        if (!of_irq->irq) {
-               pr_err("Failed to map interrupt for %s\n", np->full_name);
+               pr_err("Failed to map interrupt for %pOF\n", np);
                return -EINVAL;
        }
 
@@ -63,8 +63,7 @@ static __init int timer_irq_init(struct device_node *np,
                            of_irq->flags ? of_irq->flags : IRQF_TIMER,
                            np->full_name, clkevt);
        if (ret) {
-               pr_err("Failed to request irq %d for %s\n", of_irq->irq,
-                      np->full_name);
+               pr_err("Failed to request irq %d for %pOF\n", of_irq->irq, np);
                return ret;
        }
 
@@ -88,20 +87,20 @@ static __init int timer_clk_init(struct device_node *np,
        of_clk->clk = of_clk->name ? of_clk_get_by_name(np, of_clk->name) :
                of_clk_get(np, of_clk->index);
        if (IS_ERR(of_clk->clk)) {
-               pr_err("Failed to get clock for %s\n", np->full_name);
+               pr_err("Failed to get clock for %pOF\n", np);
                return PTR_ERR(of_clk->clk);
        }
 
        ret = clk_prepare_enable(of_clk->clk);
        if (ret) {
-               pr_err("Failed for enable clock for %s\n", np->full_name);
+               pr_err("Failed for enable clock for %pOF\n", np);
                goto out_clk_put;
        }
 
        of_clk->rate = clk_get_rate(of_clk->clk);
        if (!of_clk->rate) {
                ret = -EINVAL;
-               pr_err("Failed to get clock rate for %s\n", np->full_name);
+               pr_err("Failed to get clock rate for %pOF\n", np);
                goto out_clk_disable;
        }
 

diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c
index da81e5de74feeaa3aa7b6949cf75576b7bde33a1..028075720334f9ecfa1048e92bb448b3d87fbc13 100644 (file)
--- a/drivers/clocksource/timer-probe.c
+++ b/drivers/clocksource/timer-probe.c
@@ -40,8 +40,7 @@ void __init timer_probe(void)
 
                ret = init_func_ret(np);
                if (ret) {
-                       pr_err("Failed to initialize '%s': %d\n",
-                              of_node_full_name(np), ret);
+                       pr_err("Failed to initialize '%pOF': %d\n", np, ret);
                        continue;
                }
 

diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c
index 174d1243ea93a6d789221f290cbb536d95f6676b..8f2423789ba909bd68b74e4c18e0392aa7d8a826 100644 (file)
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
@@ -138,7 +138,7 @@ static int __init stm32_clockevent_init(struct device_node *np)
        irq = irq_of_parse_and_map(np, 0);
        if (!irq) {
                ret = -EINVAL;
-               pr_err("%s: failed to get irq.\n", np->full_name);
+               pr_err("%pOF: failed to get irq.\n", np);
                goto err_get_irq;
        }
 
@@ -168,12 +168,12 @@ static int __init stm32_clockevent_init(struct device_node *np)
        ret = request_irq(irq, stm32_clock_event_handler, IRQF_TIMER,
                        "stm32 clockevent", data);
        if (ret) {
-               pr_err("%s: failed to request irq.\n", np->full_name);
+               pr_err("%pOF: failed to request irq.\n", np);
                goto err_get_irq;
        }
 
-       pr_info("%s: STM32 clockevent driver initialized (%d bits)\n",
-                       np->full_name, bits);
+       pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",
+                       np, bits);
 
        return ret;