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

Pull timer fixes from Thomas Gleixner:
 "A rather small update for the time(r) subsystem:

   - A new clocksource driver IMX-TPM

   - Minor fixes to the alarmtimer facility

   - Device tree cleanups for Renesas drivers

   - A new kselftest and fixes for the timer related tests

   - Conversion of the clocksource drivers to use %pOF

   - Use the proper helpers to access rlimits in the posix-cpu-timer
     code"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimer: Ensure RTC module is not unloaded
  clocksource: Convert to using %pOF instead of full_name
  clocksource/drivers/bcm2835: Remove message for a memory allocation failure
  devicetree: bindings: Remove deprecated properties
  devicetree: bindings: Remove unused 32-bit CMT bindings
  devicetree: bindings: Deprecate property, update example
  devicetree: bindings: r8a73a4 and R-Car Gen2 CMT bindings
  devicetree: bindings: R-Car Gen2 CMT0 and CMT1 bindings
  devicetree: bindings: Remove sh7372 CMT binding
  clocksource/drivers/imx-tpm: Add imx tpm timer support
  dt-bindings: timer: Add nxp tpm timer binding doc
  posix-cpu-timers: Use dedicated helper to access rlimit values
  alarmtimer: Fix unavailable wake-up source in sysfs
  timekeeping: Use proper timekeeper for debug code
  kselftests: timers: set-timer-lat: Add one-shot timer test cases
  kselftests: timers: set-timer-lat: Tweak reporting when timer fires early
  kselftests: timers: freq-step: Fix build warning
  kselftests: timers: freq-step: Define ADJ_SETOFFSET if device has older kernel headers

1 files changed, 5 insertions, 6 deletions

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