[PATCH] clocksource/timer-imx-tpm: define tpm_read_sched_clock() conditionally for arm

trix@redhat.com posted 1 patch 4 years, 3 months ago
drivers/clocksource/timer-imx-tpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] clocksource/timer-imx-tpm: define tpm_read_sched_clock() conditionally for arm
Posted by trix@redhat.com 4 years, 3 months ago
From: Tom Rix <trix@redhat.com>

On aarch64 allyesconfig there is this error
timer-imx-tpm.c:78:20: error: 'tpm_read_sched_clock'
  defined but not used [-Werror=unused-function]
   78 | static u64 notrace tpm_read_sched_clock(void)
      |                    ^~~~~~~~~~~~~~~~~~~~

tpm_read_sched_clock() is only used conditionally
for arm.  So also define conditionally for arm.

Signed-off-by: Tom Rix <trix@redhat.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 60cefc247b715..bd64a8a8427f3 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)
-- 
2.26.3
Re: [PATCH] clocksource/timer-imx-tpm: define tpm_read_sched_clock() conditionally for arm
Posted by Daniel Lezcano 4 years, 3 months ago
Hi,

thanks for your patch.

It was already fixed by:

https://lore.kernel.org/r/20220303184212.2356245-1-nathan@kernel.org


On 05/03/2022 21:56, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> On aarch64 allyesconfig there is this error
> timer-imx-tpm.c:78:20: error: 'tpm_read_sched_clock'
>    defined but not used [-Werror=unused-function]
>     78 | static u64 notrace tpm_read_sched_clock(void)
>        |                    ^~~~~~~~~~~~~~~~~~~~
> 
> tpm_read_sched_clock() is only used conditionally
> for arm.  So also define conditionally for arm.
> 
> Signed-off-by: Tom Rix <trix@redhat.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 60cefc247b715..bd64a8a8427f3 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)


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