Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: pcm: avoid nused-but-set-variable warning

It will indicate below warning if W=1 was added and CONFIG_SND_DEBUG
was not set. This patch adds __maybe_unused and avoid it.

${LINUX}/sound/core/pcm_native.c: In function 'constrain_mask_params':
${LINUX}/sound/core/pcm_native.c:291:25: error: variable 'old_mask' set but not used [-Werror=unused-but-set-variable]
291 | struct snd_mask old_mask;
| ^~~~~~~~
${LINUX}/sound/core/pcm_native.c: In function 'constrain_interval_params':
${LINUX}/sound/core/pcm_native.c:327:29: error: variable 'old_interval' set but not used [-Werror=unused-but-set-variable]
327 | struct snd_interval old_interval;
| ^~~~~~~~~~~~
${LINUX}/sound/core/pcm_native.c: In function 'constrain_params_by_rules':
${LINUX}/sound/core/pcm_native.c:368:29: error: variable 'old_interval' set but not used [-Werror=unused-but-set-variable]
368 | struct snd_interval old_interval;
| ^~~~~~~~~~~~
${LINUX}/sound/core/pcm_native.c:367:25: error: variable 'old_mask' set but not used [-Werror=unused-but-set-variable]
367 | struct snd_mask old_mask;
| ^~~~~~~~
${LINUX}/sound/core/pcm_native.c: In function 'snd_pcm_hw_params_choose':
${LINUX}/sound/core/pcm_native.c:652:29: error: variable 'old_interval' set but not used [-Werror=unused-but-set-variable]
652 | struct snd_interval old_interval;
| ^~~~~~~~~~~~
${LINUX}/sound/core/pcm_native.c:651:25: error: variable 'old_mask' set but not used [-Werror=unused-but-set-variable]
651 | struct snd_mask old_mask;
| ^~~~~~~~
cc1: all warnings being treated as errors
make[3]: *** [${LINUX}/scripts/Makefile.build:250: sound/core/pcm_native.o] error 1

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/874juzg3kd.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Kuninori Morimoto and committed by
Takashi Iwai
3827597a cc265163

+6 -6
+6 -6
sound/core/pcm_native.c
··· 288 288 &substream->runtime->hw_constraints; 289 289 struct snd_mask *m; 290 290 unsigned int k; 291 - struct snd_mask old_mask; 291 + struct snd_mask old_mask __maybe_unused; 292 292 int changed; 293 293 294 294 for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) { ··· 324 324 &substream->runtime->hw_constraints; 325 325 struct snd_interval *i; 326 326 unsigned int k; 327 - struct snd_interval old_interval; 327 + struct snd_interval old_interval __maybe_unused; 328 328 int changed; 329 329 330 330 for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) { ··· 364 364 unsigned int stamp; 365 365 struct snd_pcm_hw_rule *r; 366 366 unsigned int d; 367 - struct snd_mask old_mask; 368 - struct snd_interval old_interval; 367 + struct snd_mask old_mask __maybe_unused; 368 + struct snd_interval old_interval __maybe_unused; 369 369 bool again; 370 370 int changed, err = 0; 371 371 ··· 648 648 -1 649 649 }; 650 650 const int *v; 651 - struct snd_mask old_mask; 652 - struct snd_interval old_interval; 651 + struct snd_mask old_mask __maybe_unused; 652 + struct snd_interval old_interval __maybe_unused; 653 653 int changed; 654 654 655 655 for (v = vars; *v != -1; v++) {