Skip to contentSkip to conversation

clocksource: davinci: move pr_fmt() before the includes

PATCH Applied Bartosz Golaszewski 4 participants 5 messages Jan 11, 2021 – Feb 10, 2021 Clocksource, clockevent drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clocksource: davinci: move pr_fmt() before the includes

From: Bartosz Golaszewski <[email protected]>

We no longer need to undef pr_fmt if we define our own before including any headers.

---
 drivers/clocksource/timer-davinci.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/clocksource/timer-davinci.c +2 -3
index bb4eee31ae08..9996c0542520 100644
@@ -7,6 +7,8 @@
  * (with tiny parts adopted from code by Kevin Hilman <[email protected]>)
  */
 
+#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
Signature · 1 line
2.29.1
#2 lore raw
In reply to Bartosz Golaszewski
Quoted 35 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

We no longer need to undef pr_fmt if we define our own before including any headers.

---
 drivers/clocksource/timer-davinci.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/clocksource/timer-davinci.c +2 -4
index bb4eee31ae08..9996c0542520 100644
@@ -7,6 +7,8 @@
  * (with tiny parts adopted from code by Kevin Hilman <[email protected]>)
  */
 
+#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
--
Quoted 2 lines

2.29.1

Gentle ping.

Bart

#3 lore raw
Quoted 9 lines · Bartosz Golaszewski
Quoted 8 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

We no longer need to undef pr_fmt if we define our own before including any headers.

---

Applied.

Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
#4 lore raw

[tip: timers/core] clocksource/drivers/davinci: Move pr_fmt() before the includes

In reply to Bartosz Golaszewski
The following commit has been merged into the timers/core branch of tip:

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 <[email protected]>
AuthorDate:    Mon, 11 Jan 2021 15:08:14 +01:00
Committer:     Daniel Lezcano <[email protected]>
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.

---
 drivers/clocksource/timer-davinci.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/clocksource/timer-davinci.c +2 -3
index bb4eee3..9996c05 100644
@@ -7,6 +7,8 @@
  * (with tiny parts adopted from code by Kevin Hilman <[email protected]>)
  */
 
+#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