diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-02-10 11:02:20 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-02-10 11:02:20 +0100 |
| commit | 11db5710d4a954148e00e376f04ba91a498a20dd (patch) | |
| tree | 7742ff8f4f4cb0045e6968b8a6a593df153e107b /drivers/clocksource/timer-davinci.c | |
| parent | 174bcc691f44fdd05046c694fc650933819f72c7 (diff) | |
| parent | e85c1d21b16b278f50d191155bc674633270e9c6 (diff) | |
Merge tag 'timers-v5.12-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/events updates from Daniel Lezcano:
- Drop dead code on efm32 (Uwe Kleine-König)
- Move pr_fmt() before the includes on davinci driver (Bartosz
Golaszewski)
- Clarified timer interrupt must be specified on nuvoton DT bindings
(Jonathan Neuschäfer)
- Remove tango, sirf, u300 and atlas timer drivers (Arnd Bergman)
- Add suspend/resume on pit64b (Claudiu Beznea)
Link: https://lore.kernel.org/r/3747fbde-134f-5e1d-47d5-8776c1a52aa1@linaro.org
Diffstat (limited to 'drivers/clocksource/timer-davinci.c')
| -rw-r--r-- | drivers/clocksource/timer-davinci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c index bb4eee31ae08..9996c0542520 100644 --- a/drivers/clocksource/timer-davinci.c +++ b/drivers/clocksource/timer-davinci.c @@ -7,6 +7,8 @@ * (with tiny parts adopted from code by Kevin Hilman <khilman@baylibre.com>) */ +#define pr_fmt(fmt) "%s: " fmt, __func__ + #include <linux/clk.h> #include <linux/clockchips.h> #include <linux/interrupt.h> @@ -17,9 +19,6 @@ #include <clocksource/timer-davinci.h> -#undef pr_fmt -#define pr_fmt(fmt) "%s: " fmt, __func__ - #define DAVINCI_TIMER_REG_TIM12 0x10 #define DAVINCI_TIMER_REG_TIM34 0x14 #define DAVINCI_TIMER_REG_PRD12 0x18 |