ath10k: remove unused ath10k_get_ring_byte function

[PATCH] ath10k: remove unused ath10k_get_ring_byte function

Posted by Tom Rix 2 years, 10 months ago

clang with W=1 reports
drivers/net/wireless/ath/ath10k/ce.c:88:1: error:
  unused function 'ath10k_get_ring_byte' [-Werror,-Wunused-function]
ath10k_get_ring_byte(unsigned int offset,
^
This function is not used so remove it.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/net/wireless/ath/ath10k/ce.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index b656cfc03648..c27b8204718a 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -84,13 +84,6 @@ ath10k_set_ring_byte(unsigned int offset,
 	return ((offset << addr_map->lsb) & addr_map->mask);
 }
 
-static inline unsigned int
-ath10k_get_ring_byte(unsigned int offset,
-		     struct ath10k_hw_ce_regs_addr_map *addr_map)
-{
-	return ((offset & addr_map->mask) >> (addr_map->lsb));
-}
-
 static inline u32 ath10k_ce_read32(struct ath10k *ar, u32 offset)
 {
 	struct ath10k_ce *ce = ath10k_ce_priv(ar);
-- 
2.27.0

Re: [PATCH] ath10k: remove unused ath10k_get_ring_byte function

Posted by Kalle Valo 2 years, 10 months ago

Tom Rix <trix@redhat.com> wrote:

> clang with W=1 reports:
> 
> drivers/net/wireless/ath/ath10k/ce.c:88:1: error:
>   unused function 'ath10k_get_ring_byte' [-Werror,-Wunused-function]
> ath10k_get_ring_byte(unsigned int offset,
> ^
> This function is not used so remove it.
> 
> Signed-off-by: Tom Rix <trix@redhat.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

Patch applied to ath-next branch of ath.git, thanks.

9fc093b756f6 wifi: ath10k: remove unused ath10k_get_ring_byte function

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20230322122855.2570417-1-trix@redhat.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH] ath10k: remove unused ath10k_get_ring_byte function

Posted by Simon Horman 2 years, 10 months ago

On Wed, Mar 22, 2023 at 08:28:55AM -0400, Tom Rix wrote:
> clang with W=1 reports
> drivers/net/wireless/ath/ath10k/ce.c:88:1: error:
>   unused function 'ath10k_get_ring_byte' [-Werror,-Wunused-function]
> ath10k_get_ring_byte(unsigned int offset,
> ^
> This function is not used so remove it.
> 
> Signed-off-by: Tom Rix <trix@redhat.com>

Hi Tom,

this looks good. But this patch applied, and with clang 11.0.2,
make CC=clang W=1 tells me:

drivers/net/wireless/ath/ath10k/ce.c:80:19: error: unused function 'shadow_dst_wr_ind_addr' [-Werror,-Wunused-function]
static inline u32 shadow_dst_wr_ind_addr(struct ath10k *ar,
                  ^
drivers/net/wireless/ath/ath10k/ce.c:434:20: error: unused function 'ath10k_ce_error_intr_enable' [-Werror,-Wunused-function]
static inline void ath10k_ce_error_intr_enable(struct ath10k *ar,
                   ^
Perhaps those functions should be removed too?

> ---
>  drivers/net/wireless/ath/ath10k/ce.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
> index b656cfc03648..c27b8204718a 100644
> --- a/drivers/net/wireless/ath/ath10k/ce.c
> +++ b/drivers/net/wireless/ath/ath10k/ce.c
> @@ -84,13 +84,6 @@ ath10k_set_ring_byte(unsigned int offset,
>  	return ((offset << addr_map->lsb) & addr_map->mask);
>  }
>  
> -static inline unsigned int
> -ath10k_get_ring_byte(unsigned int offset,
> -		     struct ath10k_hw_ce_regs_addr_map *addr_map)
> -{
> -	return ((offset & addr_map->mask) >> (addr_map->lsb));
> -}
> -
>  static inline u32 ath10k_ce_read32(struct ath10k *ar, u32 offset)
>  {
>  	struct ath10k_ce *ce = ath10k_ce_priv(ar);
> -- 
> 2.27.0
>

Re: [PATCH] ath10k: remove unused ath10k_get_ring_byte function

Posted by Tom Rix 2 years, 10 months ago

On 3/22/23 1:40 PM, Simon Horman wrote:
> On Wed, Mar 22, 2023 at 08:28:55AM -0400, Tom Rix wrote:
>> clang with W=1 reports
>> drivers/net/wireless/ath/ath10k/ce.c:88:1: error:
>>    unused function 'ath10k_get_ring_byte' [-Werror,-Wunused-function]
>> ath10k_get_ring_byte(unsigned int offset,
>> ^
>> This function is not used so remove it.
>>
>> Signed-off-by: Tom Rix <trix@redhat.com>
> Hi Tom,
>
> this looks good. But this patch applied, and with clang 11.0.2,
> make CC=clang W=1 tells me:
>
> drivers/net/wireless/ath/ath10k/ce.c:80:19: error: unused function 'shadow_dst_wr_ind_addr' [-Werror,-Wunused-function]
> static inline u32 shadow_dst_wr_ind_addr(struct ath10k *ar,
>                    ^
> drivers/net/wireless/ath/ath10k/ce.c:434:20: error: unused function 'ath10k_ce_error_intr_enable' [-Werror,-Wunused-function]
> static inline void ath10k_ce_error_intr_enable(struct ath10k *ar,
>                     ^
> Perhaps those functions should be removed too?

I believe these were removed with

c3ab8c9a296 ("wifi: ath10k: Remove the unused function 
shadow_dst_wr_ind_addr() and ath10k_ce_error_intr_enable()")

Tom

>
>> ---
>>   drivers/net/wireless/ath/ath10k/ce.c | 7 -------
>>   1 file changed, 7 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
>> index b656cfc03648..c27b8204718a 100644
>> --- a/drivers/net/wireless/ath/ath10k/ce.c
>> +++ b/drivers/net/wireless/ath/ath10k/ce.c
>> @@ -84,13 +84,6 @@ ath10k_set_ring_byte(unsigned int offset,
>>   	return ((offset << addr_map->lsb) & addr_map->mask);
>>   }
>>   
>> -static inline unsigned int
>> -ath10k_get_ring_byte(unsigned int offset,
>> -		     struct ath10k_hw_ce_regs_addr_map *addr_map)
>> -{
>> -	return ((offset & addr_map->mask) >> (addr_map->lsb));
>> -}
>> -
>>   static inline u32 ath10k_ce_read32(struct ath10k *ar, u32 offset)
>>   {
>>   	struct ath10k_ce *ce = ath10k_ce_priv(ar);
>> -- 
>> 2.27.0
>>

Re: [PATCH] ath10k: remove unused ath10k_get_ring_byte function

Posted by Simon Horman 2 years, 10 months ago

On Thu, Mar 23, 2023 at 07:18:09AM -0700, Tom Rix wrote:
> 
> On 3/22/23 1:40 PM, Simon Horman wrote:
> > On Wed, Mar 22, 2023 at 08:28:55AM -0400, Tom Rix wrote:
> > > clang with W=1 reports
> > > drivers/net/wireless/ath/ath10k/ce.c:88:1: error:
> > >    unused function 'ath10k_get_ring_byte' [-Werror,-Wunused-function]
> > > ath10k_get_ring_byte(unsigned int offset,
> > > ^
> > > This function is not used so remove it.
> > > 
> > > Signed-off-by: Tom Rix <trix@redhat.com>
> > Hi Tom,
> > 
> > this looks good. But this patch applied, and with clang 11.0.2,
> > make CC=clang W=1 tells me:
> > 
> > drivers/net/wireless/ath/ath10k/ce.c:80:19: error: unused function 'shadow_dst_wr_ind_addr' [-Werror,-Wunused-function]
> > static inline u32 shadow_dst_wr_ind_addr(struct ath10k *ar,
> >                    ^
> > drivers/net/wireless/ath/ath10k/ce.c:434:20: error: unused function 'ath10k_ce_error_intr_enable' [-Werror,-Wunused-function]
> > static inline void ath10k_ce_error_intr_enable(struct ath10k *ar,
> >                     ^
> > Perhaps those functions should be removed too?
> 
> I believe these were removed with
> 
> c3ab8c9a296 ("wifi: ath10k: Remove the unused function
> shadow_dst_wr_ind_addr() and ath10k_ce_error_intr_enable()")

Sorry, my bad. You are correct.
Patch looks good to me (now).

Reviewed-by: Simon Horman <simon.horman@corigine.com>