Unverified Commit 5befe22b authored by Herve Codina's avatar Herve Codina Committed by Mark Brown
Browse files

ASoC: fsl: fsl_qmc_audio: Fix snd_pcm_format_t values handling 



Running sparse on fsl_qmc_audio (make C=1) raises the following warnings:
 fsl_qmc_audio.c:387:26: warning: restricted snd_pcm_format_t degrades to integer
 fsl_qmc_audio.c:389:59: warning: incorrect type in argument 1 (different base types)
 fsl_qmc_audio.c:389:59:    expected restricted snd_pcm_format_t [usertype] format
 fsl_qmc_audio.c:389:59:    got unsigned int [assigned] i
 fsl_qmc_audio.c:564:26: warning: restricted snd_pcm_format_t degrades to integer
 fsl_qmc_audio.c:569:50: warning: incorrect type in argument 1 (different base types)
 fsl_qmc_audio.c:569:50:    expected restricted snd_pcm_format_t [usertype] format
 fsl_qmc_audio.c:569:50:    got int [assigned] i
 fsl_qmc_audio.c:573:62: warning: incorrect type in argument 1 (different base types)
 fsl_qmc_audio.c:573:62:    expected restricted snd_pcm_format_t [usertype] format
 fsl_qmc_audio.c:573:62:    got int [assigned] i

These warnings are due to snd_pcm_format_t values handling done in the
driver. Some macros and functions exist to handle safely these values.

Use dedicated macros and functions to remove these warnings.

Fixes: 075c7125 ("ASoC: fsl: Add support for QMC audio")
Signed-off-by: default avatarHerve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20230726161620.495298-1-herve.codina@bootlin.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c17bd30d

sound/soc/fsl/fsl_qmc_audio.c

+14 −14
Original line number Diff line number Diff line
@@ -372,8 +372,8 @@ static int qmc_dai_hw_rule_format_by_channels(struct qmc_dai *qmc_dai, 
	struct snd_mask *f_old = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);

	unsigned int channels = params_channels(params);

	unsigned int slot_width;

	snd_pcm_format_t format;

	struct snd_mask f_new;

	unsigned int i;



	if (!channels || channels > nb_ts) {

		dev_err(qmc_dai->dev, "channels %u not supported\n",
@@ -384,10 +384,10 @@ static int qmc_dai_hw_rule_format_by_channels(struct qmc_dai *qmc_dai, 
	slot_width = (nb_ts / channels) * 8;



	snd_mask_none(&f_new);

	for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) {

		if (snd_mask_test(f_old, i)) {

			if (snd_pcm_format_physical_width(i) <= slot_width)

				snd_mask_set(&f_new, i);

	pcm_for_each_format(format) {

		if (snd_mask_test_format(f_old, format)) {

			if (snd_pcm_format_physical_width(format) <= slot_width)

				snd_mask_set_format(&f_new, format);

		}

	}
@@ -551,26 +551,26 @@ static const struct snd_soc_dai_ops qmc_dai_ops = { 


static u64 qmc_audio_formats(u8 nb_ts)

{

	u64 formats;

	unsigned int chan_width;

	unsigned int format_width;

	int i;

	unsigned int chan_width;

	snd_pcm_format_t format;

	u64 formats_mask;



	if (!nb_ts)

		return 0;



	formats = 0;

	formats_mask = 0;

	chan_width = nb_ts * 8;

	for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) {

	pcm_for_each_format(format) {

		/*

		 * Support format other than little-endian (ie big-endian or

		 * without endianness such as 8bit formats)

		 */

		if (snd_pcm_format_little_endian(i) == 1)

		if (snd_pcm_format_little_endian(format) == 1)

			continue;



		/* Support physical width multiple of 8bit */

		format_width = snd_pcm_format_physical_width(i);

		format_width = snd_pcm_format_physical_width(format);

		if (format_width == 0 || format_width % 8)

			continue;
@@ -581,9 +581,9 @@ static u64 qmc_audio_formats(u8 nb_ts) 
		if (format_width > chan_width || chan_width % format_width)

			continue;



		formats |= (1ULL << i);

		formats_mask |= pcm_format_to_bits(format);

	}

	return formats;

	return formats_mask;

}



static int qmc_audio_dai_parse(struct qmc_audio *qmc_audio, struct device_node *np,