diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-31 16:03:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-31 16:03:47 +0200 |
| commit | bc30658eff39c5bb562174fcf93618ab6a7afe88 (patch) | |
| tree | aad37b7210699c861ea71ae9674000aae988d01b /drivers/clocksource/timer-probe.c | |
| parent | 4e2a809703e2b2300438a425b0a3f2013b55fcc6 (diff) | |
| parent | 469869d18a886e046161ca65516bd3ffcd2f804b (diff) | |
Merge branch 'clockevents/4.14' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent updates from Daniel Lezcano:
- Add the new imx-tpm driver (Dong Aisheng)
- Remove DT deprecated binding for Renesas (Magnus Damm)
- Remove error message on memory allocation (Markus Elfring)
- Convert clocksource drivers to use %pOF
Diffstat (limited to 'drivers/clocksource/timer-probe.c')
| -rw-r--r-- | drivers/clocksource/timer-probe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c index da81e5de74fe..028075720334 100644 --- 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; } |