[PATCH] ASoC: wm_adsp: Make wm_adsp_fw_text[] const

[PATCH] ASoC: wm_adsp: Make wm_adsp_fw_text[] const

[Richard Fitzgerald]

Add the extra const to wm_adsp_fw_text[] to make the array data
const.

This array should have been const data but was missing the second
const that is needed when declaring a const array of const pointers.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
 sound/soc/codecs/wm_adsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index d95b54275b5e..f0aa6e3a1cfa 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -72,7 +72,7 @@ static const struct cs_dsp_client_ops wm_adsp2_client_ops;
 
 #define WM_ADSP_NUM_FW      13
 
-static const char *wm_adsp_fw_text[WM_ADSP_NUM_FW] = {
+static const char * const wm_adsp_fw_text[WM_ADSP_NUM_FW] = {
 	[WM_ADSP_FW_MBC_VSS] =  "MBC/VSS",
 	[WM_ADSP_FW_HIFI] =     "MasterHiFi",
 	[WM_ADSP_FW_TX] =       "Tx",
-- 
2.47.3

Re: [PATCH] ASoC: wm_adsp: Make wm_adsp_fw_text[] const

[Mark Brown]

On Mon, 09 Mar 2026 14:53:10 +0000, Richard Fitzgerald wrote:
> Add the extra const to wm_adsp_fw_text[] to make the array data
> const.
> 
> This array should have been const data but was missing the second
> const that is needed when declaring a const array of const pointers.
> 
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: wm_adsp: Make wm_adsp_fw_text[] const
      commit: 87e49eb0918154f64f736d5271e9e3fe566f82b1

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark