2022-03-03 20:35:18

by Nathan Chancellor

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 <[email protected]>
---
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

2022-03-04 07:36:47

by Peng Fan

Subject: RE: [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM

> 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 <[email protected]>

Reviewed-by: Peng Fan <[email protected]>

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

2022-03-04 09:37:58

by Daniel Lezcano

Subject: Re: [PATCH -next] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM

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 <[email protected]>
> ---

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

2022-03-14 11:54:51

by tip-bot2 for Alexey Makhalov

Subject: [tip: timers/core] clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM

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 <[email protected]>
AuthorDate: Thu, 03 Mar 2022 11:42:12 -07:00
Committer: Daniel Lezcano <[email protected]>
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 <[email protected]>
Reviewed-by: Peng Fan <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Daniel Lezcano <[email protected]>
---
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)