2022-02-22 13:10:07

by Colin Ian King

[permalink] [raw]
Subject: [PATCH] ath9k: make array voice_priority static const

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


2022-02-23 03:15:33

by Jeff Johnson

[permalink] [raw]
Subject: Re: [PATCH] ath9k: make array voice_priority static const

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

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

2022-02-26 21:01:52

by Toke Høiland-Jørgensen

[permalink] [raw]
Subject: Re: [PATCH] ath9k: make array voice_priority static const

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

Acked-by: Toke Høiland-Jørgensen <[email protected]>