2021-01-11 14:12:07

by Bartosz Golaszewski

Subject: [PATCH] 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.

Signed-off-by: Bartosz Golaszewski <[email protected]>
---
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 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 <[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
--
2.29.1

2021-01-11 15:32:01

by David Lechner

Subject: Re: [PATCH] clocksource: davinci: move pr_fmt() before the includes

On 1/11/21 8:08 AM, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[email protected]>
>
> We no longer need to undef pr_fmt if we define our own before including
> any headers.
>
> Signed-off-by: Bartosz Golaszewski <[email protected]>
> ---

Acked-by: David Lechner <[email protected]>

2021-02-05 00:08:32

by Daniel Lezcano

Subject: Re: [PATCH] clocksource: davinci: move pr_fmt() before the includes

On 04/02/2021 13:37, Bartosz Golaszewski wrote:
> On Mon, Jan 11, 2021 at 3:08 PM Bartosz Golaszewski <[email protected]> wrote:
>>
>> From: Bartosz Golaszewski <[email protected]>
>>
>> We no longer need to undef pr_fmt if we define our own before including
>> any headers.
>>
>> Signed-off-by: Bartosz Golaszewski <[email protected]>
>> ---

Applied.


--
<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

2021-02-05 00:09:15

by Bartosz Golaszewski

Subject: Re: [PATCH] clocksource: davinci: move pr_fmt() before the includes

On Mon, Jan 11, 2021 at 3:08 PM Bartosz Golaszewski <[email protected]> wrote:
>
> From: Bartosz Golaszewski <[email protected]>
>
> We no longer need to undef pr_fmt if we define our own before including
> any headers.
>
> Signed-off-by: Bartosz Golaszewski <[email protected]>
> ---
> 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 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 <[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
> --
> 2.29.1
>

Gentle ping.

Bart

2021-02-10 10:21:32

by tip-bot2 for Haifeng Xu

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 <[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.

Signed-off-by: Bartosz Golaszewski <[email protected]>
Acked-by: David Lechner <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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 <[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