Skip to content

Commit 3827597

Browse files
morimototiwai
authored andcommitted
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 <[email protected]> Reviewed-by: Takashi Sakamoto <[email protected]> Tested-by: Takashi Sakamoto <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent cc26516 commit 3827597

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

sound/core/pcm_native.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ static int constrain_mask_params(struct snd_pcm_substream *substream,
288288
&substream->runtime->hw_constraints;
289289
struct snd_mask *m;
290290
unsigned int k;
291-
struct snd_mask old_mask;
291+
struct snd_mask old_mask __maybe_unused;
292292
int changed;
293293

294294
for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) {
@@ -324,7 +324,7 @@ static int constrain_interval_params(struct snd_pcm_substream *substream,
324324
&substream->runtime->hw_constraints;
325325
struct snd_interval *i;
326326
unsigned int k;
327-
struct snd_interval old_interval;
327+
struct snd_interval old_interval __maybe_unused;
328328
int changed;
329329

330330
for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) {
@@ -364,8 +364,8 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
364364
unsigned int stamp;
365365
struct snd_pcm_hw_rule *r;
366366
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;
369369
bool again;
370370
int changed, err = 0;
371371

@@ -648,8 +648,8 @@ static int snd_pcm_hw_params_choose(struct snd_pcm_substream *pcm,
648648
-1
649649
};
650650
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;
653653
int changed;
654654

655655
for (v = vars; *v != -1; v++) {

0 commit comments

Comments
 (0)