Unverified Commit c3079282 authored by Min-Hua Chen's avatar Min-Hua Chen Committed by Mark Brown
Browse files

ASoC: ti: davinci-mcasp: Use pcm_for_each_format() macro 



Use pcm_for_each_format for the PCM format iteration and fix the
following sparse warnings.

sound/soc/ti/davinci-mcasp.c:1336:26: sparse: warning: restricted snd_pcm_format_t degrades to integer
sound/soc/ti/davinci-mcasp.c:1358:26: sparse: warning: restricted snd_pcm_format_t degrades to integer
sound/soc/ti/davinci-mcasp.c:1438:26: sparse: warning: restricted snd_pcm_format_t degrades to integer

No functional changes.

Signed-off-by: default avatarMin-Hua Chen <minhuadotchen@gmail.com>
Link: https://lore.kernel.org/r/20230519211636.3699-1-minhuadotchen@gmail.com


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

sound/soc/ti/davinci-mcasp.c

+15 −12
Original line number Diff line number Diff line
@@ -1328,15 +1328,16 @@ static int davinci_mcasp_hw_rule_slot_width(struct snd_pcm_hw_params *params, 
	struct davinci_mcasp_ruledata *rd = rule->private;

	struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);

	struct snd_mask nfmt;

	int i, slot_width;

	int slot_width;

	snd_pcm_format_t i;



	snd_mask_none(&nfmt);

	slot_width = rd->mcasp->slot_width;



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

		if (snd_mask_test(fmt, i)) {

	pcm_for_each_format(i) {

		if (snd_mask_test_format(fmt, i)) {

			if (snd_pcm_format_width(i) <= slot_width) {

				snd_mask_set(&nfmt, i);

				snd_mask_set_format(&nfmt, i);

			}

		}

	}
@@ -1350,15 +1351,16 @@ static int davinci_mcasp_hw_rule_format_width(struct snd_pcm_hw_params *params, 
	struct davinci_mcasp_ruledata *rd = rule->private;

	struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);

	struct snd_mask nfmt;

	int i, format_width;

	int format_width;

	snd_pcm_format_t i;



	snd_mask_none(&nfmt);

	format_width = rd->mcasp->max_format_width;



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

		if (snd_mask_test(fmt, i)) {

	pcm_for_each_format(i) {

		if (snd_mask_test_format(fmt, i)) {

			if (snd_pcm_format_width(i) == format_width) {

				snd_mask_set(&nfmt, i);

				snd_mask_set_format(&nfmt, i);

			}

		}

	}
@@ -1431,12 +1433,13 @@ static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params, 
	struct snd_mask nfmt;

	int rate = params_rate(params);

	int slots = rd->mcasp->tdm_slots;

	int i, count = 0;

	int count = 0;

	snd_pcm_format_t i;



	snd_mask_none(&nfmt);



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

		if (snd_mask_test(fmt, i)) {

	pcm_for_each_format(i) {

		if (snd_mask_test_format(fmt, i)) {

			uint sbits = snd_pcm_format_width(i);

			unsigned int sysclk_freq;

			int ppm;
@@ -1454,7 +1457,7 @@ static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params, 
							 sbits * slots * rate,

							 false);

			if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) {

				snd_mask_set(&nfmt, i);

				snd_mask_set_format(&nfmt, i);

				count++;

			}

		}