Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...

[sfrench/cifs-2.6.git] / drivers / clocksource / timer-of.c

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index 4d7aef9d9c15422df0e9973e72379b2e21256f47..c79122d8e10d0b9abd8f5428ceb00d049fa20d05 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;
        }