* [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM
@ 2022-03-03 18:42 Nathan Chancellor
2022-03-04 0:56 ` Peng Fan
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Nathan Chancellor @ 2022-03-03 18:42 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner
Cc: Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, Peng Fan, linux-kernel, linux-arm-kernel,
patches, Nathan Chancellor
When building this driver for an architecture other than ARCH=arm:
drivers/clocksource/timer-imx-tpm.c:78:20: error: unused function 'tpm_read_sched_clock' [-Werror,-Wunused-function]
static u64 notrace tpm_read_sched_clock(void)
^
1 error generated.
Move the function definition under the existing CONFIG_ARM section so
there is no more warning.
Fixes: 10720e120e2b ("clocksource/drivers/imx-tpm: Exclude sched clock for ARM64")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
drivers/clocksource/timer-imx-tpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/timer-imx-tpm.c b/drivers/clocksource/timer-imx-tpm.c
index 60cefc247b71..bd64a8a8427f 100644
--- a/drivers/clocksource/timer-imx-tpm.c
+++ b/drivers/clocksource/timer-imx-tpm.c
@@ -73,12 +73,12 @@ static unsigned long tpm_read_current_timer(void)
{
return tpm_read_counter();
}
-#endif
static u64 notrace tpm_read_sched_clock(void)
{
return tpm_read_counter();
}
+#endif
static int tpm_set_next_event(unsigned long delta,
struct clock_event_device *evt)
base-commit: b22a1c270f533e30bc5d5d4cab6199a2cbb07b07
--
2.35.1
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM
2022-03-03 18:42 [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM Nathan Chancellor
@ 2022-03-04 0:56 ` Peng Fan
2022-03-04 8:18 ` Daniel Lezcano
2022-03-14 9:28 ` [tip: timers/core] " tip-bot2 for Nathan Chancellor
2 siblings, 0 replies; 4+ messages in thread
From: Peng Fan @ 2022-03-04 0:56 UTC (permalink / raw)
To: Nathan Chancellor, Daniel Lezcano, Thomas Gleixner
Cc: Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
dl-linux-imx, linux-kernel, linux-arm-kernel, patches
> Subject: [PATCH -next] clocksource/drivers/imx-tpm: Move
> tpm_read_sched_clock() under CONFIG_ARM
>
> When building this driver for an architecture other than ARCH=arm:
>
> drivers/clocksource/timer-imx-tpm.c:78:20: error: unused function
> 'tpm_read_sched_clock' [-Werror,-Wunused-function]
> static u64 notrace tpm_read_sched_clock(void)
> ^
> 1 error generated.
>
> Move the function definition under the existing CONFIG_ARM section so there
> is no more warning.
>
> Fixes: 10720e120e2b ("clocksource/drivers/imx-tpm: Exclude sched clock for
> ARM64")
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> drivers/clocksource/timer-imx-tpm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/timer-imx-tpm.c
> b/drivers/clocksource/timer-imx-tpm.c
> index 60cefc247b71..bd64a8a8427f 100644
> --- a/drivers/clocksource/timer-imx-tpm.c
> +++ b/drivers/clocksource/timer-imx-tpm.c
> @@ -73,12 +73,12 @@ static unsigned long tpm_read_current_timer(void)
> {
> return tpm_read_counter();
> }
> -#endif
>
> static u64 notrace tpm_read_sched_clock(void) {
> return tpm_read_counter();
> }
> +#endif
>
> static int tpm_set_next_event(unsigned long delta,
> struct clock_event_device *evt)
>
> base-commit: b22a1c270f533e30bc5d5d4cab6199a2cbb07b07
> --
> 2.35.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM
2022-03-03 18:42 [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM Nathan Chancellor
2022-03-04 0:56 ` Peng Fan
@ 2022-03-04 8:18 ` Daniel Lezcano
2022-03-14 9:28 ` [tip: timers/core] " tip-bot2 for Nathan Chancellor
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Lezcano @ 2022-03-04 8:18 UTC (permalink / raw)
To: Nathan Chancellor, Thomas Gleixner
Cc: Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, Peng Fan, linux-kernel, linux-arm-kernel,
patches
On 03/03/2022 19:42, Nathan Chancellor wrote:
> When building this driver for an architecture other than ARCH=arm:
>
> drivers/clocksource/timer-imx-tpm.c:78:20: error: unused function 'tpm_read_sched_clock' [-Werror,-Wunused-function]
> static u64 notrace tpm_read_sched_clock(void)
> ^
> 1 error generated.
>
> Move the function definition under the existing CONFIG_ARM section so
> there is no more warning.
>
> Fixes: 10720e120e2b ("clocksource/drivers/imx-tpm: Exclude sched clock for ARM64")
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
Applied, thx
--
<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
^ permalink raw reply [flat|nested] 4+ messages in thread* [tip: timers/core] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM
2022-03-03 18:42 [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM Nathan Chancellor
2022-03-04 0:56 ` Peng Fan
2022-03-04 8:18 ` Daniel Lezcano
@ 2022-03-14 9:28 ` tip-bot2 for Nathan Chancellor
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Nathan Chancellor @ 2022-03-14 9:28 UTC (permalink / raw)
To: linux-tip-commits
Cc: Nathan Chancellor, Peng Fan, Daniel Lezcano, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: bf127df3cceada8693888fc86a3121c38ef25701
Gitweb: https://git.kernel.org/tip/bf127df3cceada8693888fc86a3121c38ef25701
Author: Nathan Chancellor <nathan@kernel.org>
AuthorDate: Thu, 03 Mar 2022 11:42:12 -07:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Mon, 07 Mar 2022 18:27:22 +01:00
clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM
When building this driver for an architecture other than ARCH=arm:
drivers/clocksource/timer-imx-tpm.c:78:20: error: unused function 'tpm_read_sched_clock' [-Werror,-Wunused-function]
static u64 notrace tpm_read_sched_clock(void)
^
1 error generated.
Move the function definition under the existing CONFIG_ARM section so
there is no more warning.
Fixes: 10720e120e2b ("clocksource/drivers/imx-tpm: Exclude sched clock for ARM64")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20220303184212.2356245-1-nathan@kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-imx-tpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/timer-imx-tpm.c b/drivers/clocksource/timer-imx-tpm.c
index 60cefc2..bd64a8a 100644
--- a/drivers/clocksource/timer-imx-tpm.c
+++ b/drivers/clocksource/timer-imx-tpm.c
@@ -73,12 +73,12 @@ static unsigned long tpm_read_current_timer(void)
{
return tpm_read_counter();
}
-#endif
static u64 notrace tpm_read_sched_clock(void)
{
return tpm_read_counter();
}
+#endif
static int tpm_set_next_event(unsigned long delta,
struct clock_event_device *evt)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-14 9:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-03 18:42 [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM Nathan Chancellor
2022-03-04 0:56 ` Peng Fan
2022-03-04 8:18 ` Daniel Lezcano
2022-03-14 9:28 ` [tip: timers/core] " tip-bot2 for Nathan Chancellor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®