diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-04 16:06:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-04 16:06:34 -0400 |
commit | dd90cccffc20a15d8e4c3ac8813f4b6a6cd4766f (patch) | |
tree | b870506b456e3b965638035abb0b2c944b024fd9 /drivers/clocksource/timer-stm32.c | |
parent | b1b6f83ac938d176742c85757960dec2cf10e468 (diff) | |
parent | 51218298a25e6942957c5595f2abf130d47d5df9 (diff) |
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
Diffstat (limited to 'drivers/clocksource/timer-stm32.c')
-rw-r--r-- | drivers/clocksource/timer-stm32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index 174d1243ea93..8f2423789ba9 100644 --- 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) | |||
138 | irq = irq_of_parse_and_map(np, 0); | 138 | irq = irq_of_parse_and_map(np, 0); |
139 | if (!irq) { | 139 | if (!irq) { |
140 | ret = -EINVAL; | 140 | ret = -EINVAL; |
141 | pr_err("%s: failed to get irq.\n", np->full_name); | 141 | pr_err("%pOF: failed to get irq.\n", np); |
142 | goto err_get_irq; | 142 | goto err_get_irq; |
143 | } | 143 | } |
144 | 144 | ||
@@ -168,12 +168,12 @@ static int __init stm32_clockevent_init(struct device_node *np) | |||
168 | ret = request_irq(irq, stm32_clock_event_handler, IRQF_TIMER, | 168 | ret = request_irq(irq, stm32_clock_event_handler, IRQF_TIMER, |
169 | "stm32 clockevent", data); | 169 | "stm32 clockevent", data); |
170 | if (ret) { | 170 | if (ret) { |
171 | pr_err("%s: failed to request irq.\n", np->full_name); | 171 | pr_err("%pOF: failed to request irq.\n", np); |
172 | goto err_get_irq; | 172 | goto err_get_irq; |
173 | } | 173 | } |
174 | 174 | ||
175 | pr_info("%s: STM32 clockevent driver initialized (%d bits)\n", | 175 | pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n", |
176 | np->full_name, bits); | 176 | np, bits); |
177 | 177 | ||
178 | return ret; | 178 | return ret; |
179 | 179 | ||