2023-06-27 12:10:56

by Colin Ian King

Subject: [PATCH][next] ALSA: oxfw: make read-only const array models static

Don't populate the const array on the stack, instead make it static.

Signed-off-by: Colin Ian King <[email protected]>
---
sound/firewire/oxfw/oxfw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 9523479fa94a..63d40f1a914f 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -44,7 +44,7 @@ struct compat_info {

static bool detect_loud_models(struct fw_unit *unit)
{
- const char *const models[] = {
+ static const char *const models[] = {
"Onyxi",
"Onyx-i",
"Onyx 1640i",
--
2.39.2

2023-06-27 23:55:50

by Takashi Sakamoto

Subject: Re: [PATCH][next] ALSA: oxfw: make read-only const array models static

Hi,

On Tue, Jun 27, 2023 at 12:32:53PM +0100, Colin Ian King wrote:
> Don't populate the const array on the stack, instead make it static.
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> sound/firewire/oxfw/oxfw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
> index 9523479fa94a..63d40f1a914f 100644
> --- a/sound/firewire/oxfw/oxfw.c
> +++ b/sound/firewire/oxfw/oxfw.c
> @@ -44,7 +44,7 @@ struct compat_info {
>
> static bool detect_loud_models(struct fw_unit *unit)
> {
> - const char *const models[] = {
> + static const char *const models[] = {
> "Onyxi",
> "Onyx-i",
> "Onyx 1640i",
> --
> 2.39.2

Indeed. It is preferable.

Reviewed-by: Takashi Sakamoto <[email protected]>

I found that ALSA fireface driver includes the similar issue. I'll send a
patch to fix it later.


Thanks

Takashi Sakamoto

2023-06-28 09:51:44

by Takashi Iwai

Subject: Re: [PATCH][next] ALSA: oxfw: make read-only const array models static

On Tue, 27 Jun 2023 13:32:53 +0200,
Colin Ian King wrote:
>
> Don't populate the const array on the stack, instead make it static.
>
> Signed-off-by: Colin Ian King <[email protected]>

Thanks, applied.


Takashi