From: "tip-bot2 for Bartosz Golaszewski" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
David Lechner <david@lechnology.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] clocksource/drivers/davinci: Move pr_fmt() before the includes
Date: Wed, 10 Feb 2021 10:06:25 -0000 [thread overview]
Message-ID: <161295158523.23325.8387673102530314590.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210111140814.3668-1-brgl@bgdev.pl>
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@baylibre.com>
AuthorDate: Mon, 11 Jan 2021 15:08:14 +01:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.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@baylibre.com>
Acked-by: David Lechner <david@lechnology.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.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@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
prev parent reply other threads:[~2021-02-10 10:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 14:08 [PATCH] clocksource: davinci: move pr_fmt() before the includes Bartosz Golaszewski
2021-01-11 15:28 ` David Lechner
2021-02-04 12:37 ` Bartosz Golaszewski
2021-02-04 12:40 ` Daniel Lezcano
2021-02-10 10:06 ` tip-bot2 for Bartosz Golaszewski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161295158523.23325.8387673102530314590.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bgolaszewski@baylibre.com \
--cc=daniel.lezcano@linaro.org \
--cc=david@lechnology.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.