[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <161295158523.23325.8387673102530314590.tip-bot2@tip-bot2>
Date: Wed, 10 Feb 2021 10:06:25 -0000
From: "tip-bot2 for Bartosz Golaszewski" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Bartosz Golaszewski <bgolaszewski@...libre.com>,
David Lechner <david@...hnology.com>,
Daniel Lezcano <daniel.lezcano@...aro.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: timers/core] clocksource/drivers/davinci: Move pr_fmt() before
the includes
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@...libre.com>
AuthorDate: Mon, 11 Jan 2021 15:08:14 +01:00
Committer: Daniel Lezcano <daniel.lezcano@...aro.org>
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@...libre.com>
Acked-by: David Lechner <david@...hnology.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
Link: https://lore.kernel.org/r/20210111140814.3668-1-brgl@bgdev.pl
---
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@...libre.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
Powered by blists - more mailing lists