iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Min-Hua Chen <minhuadotchen@gmail.com>
Link: https://lore.kernel.org/r/20230519211636.3699-1-minhuadotchen@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Min-Hua Chen 2023-05-20 05:16:36 +08:00 committed by Mark Brown
parent e89f45edb7
commit c3079282fd
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/ti/davinci-mcasp.c
View File

@ -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 davinci_mcasp_ruledata *rd = rule->private;
struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
struct snd_mask nfmt; struct snd_mask nfmt;
int i, slot_width; int slot_width;
snd_pcm_format_t i;
snd_mask_none(&nfmt); snd_mask_none(&nfmt);
slot_width = rd->mcasp->slot_width; slot_width = rd->mcasp->slot_width;
for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { pcm_for_each_format(i) {
if (snd_mask_test(fmt, i)) { if (snd_mask_test_format(fmt, i)) {
if (snd_pcm_format_width(i) <= slot_width) { 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 davinci_mcasp_ruledata *rd = rule->private;
struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
struct snd_mask nfmt; struct snd_mask nfmt;
int i, format_width; int format_width;
snd_pcm_format_t i;
snd_mask_none(&nfmt); snd_mask_none(&nfmt);
format_width = rd->mcasp->max_format_width; format_width = rd->mcasp->max_format_width;
for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { pcm_for_each_format(i) {
if (snd_mask_test(fmt, i)) { if (snd_mask_test_format(fmt, i)) {
if (snd_pcm_format_width(i) == format_width) { 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; struct snd_mask nfmt;
int rate = params_rate(params); int rate = params_rate(params);
int slots = rd->mcasp->tdm_slots; int slots = rd->mcasp->tdm_slots;
int i, count = 0; int count = 0;
snd_pcm_format_t i;
snd_mask_none(&nfmt); snd_mask_none(&nfmt);
for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { pcm_for_each_format(i) {
if (snd_mask_test(fmt, i)) { if (snd_mask_test_format(fmt, i)) {
uint sbits = snd_pcm_format_width(i); uint sbits = snd_pcm_format_width(i);
unsigned int sysclk_freq; unsigned int sysclk_freq;
int ppm; int ppm;
@ -1454,7 +1457,7 @@ static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params,
sbits * slots * rate, sbits * slots * rate,
false); false);
if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) { if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) {
snd_mask_set(&nfmt, i); snd_mask_set_format(&nfmt, i);
count++; count++;
} }
} }