Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0b62834e authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ALSA: pcm: Add snd_mask_set_format() helper for standard usages 



Many drivers calling snd_mask_set() need to do ugly cast with __force
for shutting up the sparse warnings.  Actually almost all of them are
about setting the format, so it's far better to provide a common
helper snd_mask_set_format() to pass SNDRV_PCM_FORMAT_* directly
without the cast.

There are a few other calls of snd_mask_set(), but they are in the PCM
core code, so we leave them for now.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fd563611

include/sound/pcm_params.h

+8 −2
Original line number Diff line number Diff line
@@ -87,6 +87,13 @@ static inline void snd_mask_set(struct snd_mask *mask, unsigned int val) 
	mask->bits[MASK_OFS(val)] |= MASK_BIT(val);

}



/* Most of drivers need only this one */

static inline void snd_mask_set_format(struct snd_mask *mask,

				       snd_pcm_format_t format)

{

	snd_mask_set(mask, (__force unsigned int)format);

}



static inline void snd_mask_reset(struct snd_mask *mask, unsigned int val)

{

	mask->bits[MASK_OFS(val)] &= ~MASK_BIT(val);
@@ -369,8 +376,7 @@ static inline int params_physical_width(const struct snd_pcm_hw_params *p) 
static inline void

params_set_format(struct snd_pcm_hw_params *p, snd_pcm_format_t fmt)

{

	snd_mask_set(hw_param_mask(p, SNDRV_PCM_HW_PARAM_FORMAT),

		(__force int)fmt);

	snd_mask_set_format(hw_param_mask(p, SNDRV_PCM_HW_PARAM_FORMAT), fmt);

}



#endif /* __SOUND_PCM_PARAMS_H */