[PATCH] ath9k: make array voice_priority static const

[PATCH] ath9k: make array voice_priority static const

[Colin Ian King]

Don't populate the read-only array voice_priority on the stack but
instead make it static const. Also makes the object code a little
smaller.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 drivers/net/wireless/ath/ath9k/mci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 39d46c203f6b..5e0ae7e6412f 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -43,7 +43,7 @@ static bool ath_mci_add_profile(struct ath_common *common,
 				struct ath_mci_profile_info *info)
 {
 	struct ath_mci_profile_info *entry;
-	u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };
+	static const u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };
 
 	if ((mci->num_sco == ATH_MCI_MAX_SCO_PROFILE) &&
 	    (info->type == MCI_GPM_COEX_PROFILE_VOICE))
-- 
2.34.1

Re: [PATCH] ath9k: make array voice_priority static const

[Jeff Johnson]

On 2/22/2022 4:17 AM, Colin Ian King wrote:
> Don't populate the read-only array voice_priority on the stack but
> instead make it static const. Also makes the object code a little
> smaller.
> 
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>   drivers/net/wireless/ath/ath9k/mci.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
> index 39d46c203f6b..5e0ae7e6412f 100644
> --- a/drivers/net/wireless/ath/ath9k/mci.c
> +++ b/drivers/net/wireless/ath/ath9k/mci.c
> @@ -43,7 +43,7 @@ static bool ath_mci_add_profile(struct ath_common *common,
>   				struct ath_mci_profile_info *info)
>   {
>   	struct ath_mci_profile_info *entry;
> -	u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };
> +	static const u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };
>   
>   	if ((mci->num_sco == ATH_MCI_MAX_SCO_PROFILE) &&
>   	    (info->type == MCI_GPM_COEX_PROFILE_VOICE))

Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>

An additional cleanup that could be performed in that function:

		if (info->voice_type < sizeof(voice_priority))

replace sizeof() with ARRAY_SIZE() so that it works correctly if the 
base type is ever changed from u8

Re: [PATCH] ath9k: make array voice_priority static const

[Dan Carpenter]

On Tue, Feb 22, 2022 at 05:19:01PM -0800, Jeff Johnson wrote:
> On 2/22/2022 4:17 AM, Colin Ian King wrote:
> > Don't populate the read-only array voice_priority on the stack but
> > instead make it static const. Also makes the object code a little
> > smaller.
> > 
> > Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> > ---
> >   drivers/net/wireless/ath/ath9k/mci.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
> > index 39d46c203f6b..5e0ae7e6412f 100644
> > --- a/drivers/net/wireless/ath/ath9k/mci.c
> > +++ b/drivers/net/wireless/ath/ath9k/mci.c
> > @@ -43,7 +43,7 @@ static bool ath_mci_add_profile(struct ath_common *common,
> >   				struct ath_mci_profile_info *info)
> >   {
> >   	struct ath_mci_profile_info *entry;
> > -	u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };
> > +	static const u8 voice_priority[] = { 110, 110, 110, 112, 110, 110, 114, 116, 118 };
> >   	if ((mci->num_sco == ATH_MCI_MAX_SCO_PROFILE) &&
> >   	    (info->type == MCI_GPM_COEX_PROFILE_VOICE))
> 
> Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> 
> An additional cleanup that could be performed in that function:
> 
> 		if (info->voice_type < sizeof(voice_priority))
> 
> replace sizeof() with ARRAY_SIZE() so that it works correctly if the base
> type is ever changed from u8

You're right that ARRAY_SIZE() is better style but we have a bunch of
static analysis to catch the bug if someone changes the type to int or
whatever.

regards,
dan carpenter

Re: [PATCH] ath9k: make array voice_priority static const

[Toke Høiland-Jørgensen]

Colin Ian King <colin.i.king@gmail.com> writes:

> Don't populate the read-only array voice_priority on the stack but
> instead make it static const. Also makes the object code a little
> smaller.
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>

Re: [PATCH] ath9k: make array voice_priority static const

[Kalle Valo]

Colin Ian King <colin.i.king@gmail.com> wrote:

> Don't populate the read-only array voice_priority on the stack but
> instead make it static const. Also makes the object code a little
> smaller.
> 
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

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

44d445c02388 ath9k: make array voice_priority static const

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20220222121749.87513-1-colin.i.king@gmail.com/

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