github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 07:03:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SOF: sof-audio: pcm_id is __le32

Browse Source 
The pcm_id value is __le32 so convert it before passing to the dev_dbg
function to be printed. Also fixup some other uses of __le32 data and
a couple of places where %u should have been used instead of %d

Picked up by sparse prototype for variadic and printf
function checking. Fixes a large number of sparse warnings, such as:

sound/soc/sof/pcm.c:84:25: warning: incorrect type in argument 4 (different base types)
sound/soc/sof/pcm.c:84:25:    expected unsigned int
sound/soc/sof/pcm.c:84:25:    got restricted __le32 [usertype] pcm_id

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://patch.msgid.link/20260310125106.178944-1-ben.dooks@codethink.co.uk
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ben Dooks 2026-03-10 12:51:06 +00:00 committed by Mark Brown
parent 49c002275a
commit 207fd1f4d8
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/sof/compress.c
View File

@ -248,7 +248,7 @@ static int sof_compr_set_params(struct snd_soc_component *component,
ipc_params_reply.posn_offset);
if (ret < 0) {
dev_err(component->dev, "Invalid stream data offset for Compr %d\n",
spcm->pcm.pcm_id);
le32_to_cpu(spcm->pcm.pcm_id));
goto out;
}

13
sound/soc/sof/ipc4-topology.c
View File

@ -581,6 +581,7 @@ sof_ipc4_update_card_components_string(struct snd_sof_widget *swidget,
struct snd_soc_component *scomp = spcm->scomp;
struct snd_soc_card *card = scomp->card;
const char *pt_marker = "iec61937-pcm";
unsigned pcm_id = le32_to_cpu(spcm->pcm.pcm_id);
/*
* Update the card's components list with iec61937-pcm and a list of PCM
@ -595,21 +596,21 @@ sof_ipc4_update_card_components_string(struct snd_sof_widget *swidget,
if (strstr(card->components, pt_marker))
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
"%s,%d",
"%s,%u",
card->components,
spcm->pcm.pcm_id);
pcm_id);
else
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
"%s %s:%d",
"%s %s:%u",
card->components,
pt_marker,
spcm->pcm.pcm_id);
pcm_id);
devm_kfree(card->dev, tmp);
} else {
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
"%s:%d", pt_marker,
spcm->pcm.pcm_id);
"%s:%u", pt_marker,
pcm_id);
}
if (!card->components)

4
sound/soc/sof/pcm.c
View File

@ -361,7 +361,7 @@ static int sof_pcm_prepare(struct snd_soc_component *component,
ret = sof_widget_list_setup(sdev, spcm, params, platform_params, dir);
if (ret < 0) {
dev_err(sdev->dev, "failed widget list set up for pcm %d dir %d\n",
spcm->pcm.pcm_id, dir);
le32_to_cpu(spcm->pcm.pcm_id), dir);
spcm->stream[dir].list = NULL;
snd_soc_dapm_dai_free_widgets(&list);
return ret;
@ -652,7 +652,7 @@ static int sof_pcm_new(struct snd_soc_component *component,
}
dev_dbg(spcm->scomp->dev, "pcm%u (%s): Entry: pcm_construct\n",
spcm->pcm.pcm_id, spcm->pcm.pcm_name);
le32_to_cpu(spcm->pcm.pcm_id), spcm->pcm.pcm_name);
/* do we need to pre-allocate playback audio buffer pages */
if (!spcm->pcm.playback)

11
sound/soc/sof/sof-audio.h
View File

@ -641,17 +641,20 @@ void snd_sof_pcm_init_elapsed_work(struct work_struct *work);
*/
#define spcm_dbg(__spcm, __dir, __fmt, ...) \
dev_dbg((__spcm)->scomp->dev, "pcm%u (%s), dir %d: " __fmt, \
(__spcm)->pcm.pcm_id, (__spcm)->pcm.pcm_name, __dir, \
le32_to_cpu((__spcm)->pcm.pcm_id), \
(__spcm)->pcm.pcm_name, __dir, \
##__VA_ARGS__)
#define spcm_dbg_ratelimited(__spcm, __dir, __fmt, ...) \
dev_dbg_ratelimited((__spcm)->scomp->dev, "pcm%u (%s), dir %d: " __fmt, \
(__spcm)->pcm.pcm_id, (__spcm)->pcm.pcm_name, __dir, \
##__VA_ARGS__)
le32_to_cpu((__spcm)->pcm.pcm_id), \
(__spcm)->pcm.pcm_name, __dir, \
##__VA_ARGS__)
#define spcm_err(__spcm, __dir, __fmt, ...) \
dev_err((__spcm)->scomp->dev, "%s: pcm%u (%s), dir %d: " __fmt, \
__func__, (__spcm)->pcm.pcm_id, (__spcm)->pcm.pcm_name, __dir, \
__func__, le32_to_cpu((__spcm)->pcm.pcm_id), \
(__spcm)->pcm.pcm_name, __dir, \
##__VA_ARGS__)
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMPRESS)

10
sound/soc/sof/topology.c
View File

@ -776,7 +776,7 @@ static int sof_parse_token_sets(struct snd_soc_component *scomp,
break;
default:
dev_err(scomp->dev, "error: unknown token type %d\n",
array->type);
le32_to_cpu(array->type));
return -EINVAL;
}
@ -971,7 +971,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
int ret;
dev_dbg(scomp->dev, "tplg: load control type %d name : %s\n",
hdr->type, hdr->name);
le32_to_cpu(hdr->type), hdr->name);
scontrol = kzalloc_obj(*scontrol);
if (!scontrol)
@ -1016,7 +1016,9 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
case SND_SOC_TPLG_DAPM_CTL_PIN:
default:
dev_warn(scomp->dev, "control type not supported %d:%d:%d\n",
hdr->ops.get, hdr->ops.put, hdr->ops.info);
le32_to_cpu(hdr->ops.get),
le32_to_cpu(hdr->ops.put),
le32_to_cpu(hdr->ops.info));
kfree(scontrol->name);
kfree(scontrol);
return 0;
@ -1524,7 +1526,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
case snd_soc_dapm_pga:
if (!le32_to_cpu(tw->num_kcontrols)) {
dev_err(scomp->dev, "invalid kcontrol count %d for volume\n",
tw->num_kcontrols);
le32_to_cpu(tw->num_kcontrols));
ret = -EINVAL;
break;
}