The following commit has been merged into the timers/core branch of tip: Commit-ID: 98509310e490bf3de13c96fbbbca8ef4af9db010 Gitweb: https://git.kernel.org/tip/98509310e490bf3de13c96fbbbca8ef4af9db010 Author: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> AuthorDate: Mon, 11 Jan 2021 15:08:14 +01:00 Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> CommitterDate: Mon, 18 Jan 2021 16:31:39 +01:00 clocksource/drivers/davinci: Move pr_fmt() before the includes We no longer need to undef pr_fmt if we define our own before including any headers. Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> Acked-by: David Lechner <david@xxxxxxxxxxxxxx> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> Link: https://lore.kernel.org/r/20210111140814.3668-1-brgl@xxxxxxxx --- drivers/clocksource/timer-davinci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c index bb4eee3..9996c05 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@xxxxxxxxxxxx>) */ +#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
|