ASoC: SOF: sof-audio: pcm_id is __le32
Subsystems (3)
PATCH RESEND v4 1/1 ASoC: SOF: sof-audio: pcm_id is __le32
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 intsound/soc/sof/pcm.c:84:25: got restricted __le32 [usertype] pcm_id
---
v2: fix missing __le32 conversions
v3: further __le32 fixes for other header values
v4: fix signed-ness of printf formatting
--- sound/soc/sof/compress.c | 2 +- sound/soc/sof/pcm.c | 2 +- sound/soc/sof/topology.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)
sound/soc/sof/compress.c +1 -1
@@ -247,7 +247,7 @@ static int sof_compr_set_params(struct snd_soc_component *component, ret =snd_sof_set_stream_data_offset (sdev, &spcm->stream[cstream->direction], ipc_params_reply.posn_offset);if (ret <0 ) { -dev_err (component->dev,"Invalid stream data offset for Compr %d\n" , +dev_err (component->dev,"Invalid stream data offset for Compr %u\n" ,le32_to_cpu (spcm->pcm.pcm_id)); goto out; }
sound/soc/sof/pcm.c +1 -1
@@ -360,7 +360,7 @@ static int sof_pcm_prepare(struct snd_soc_component *component, platform_params = &spcm->platform_params[substream->stream]; 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" , +dev_err (sdev->dev,"failed widget list set up for pcm %d dir %u\n" ,le32_to_cpu (spcm->pcm.pcm_id), dir); spcm->stream[dir].list =NULL ;snd_soc_dapm_dai_free_widgets (&list);
sound/soc/sof/topology.c +6 -6
@@ -775,7 +775,7 @@ static int sof_parse_token_sets(struct snd_soc_component *scomp, array);break ;default : -dev_err (scomp->dev,"error: unknown token type %d\n" , +dev_err (scomp->dev,"error: unknown token type %u\n" ,le32_to_cpu (array->type));return -EINVAL ; }
@@ -880,7 +880,7 @@ static int sof_control_load_volume(struct snd_soc_component *scomp,ARRAY_SIZE (led_tokens), mc->priv.array, le32_to_cpu(mc->priv.size));if (ret !=0 ) { -dev_err (scomp->dev,"error: parse led tokens failed %d\n" , +dev_err (scomp->dev,"error: parse led tokens failed %u\n" ,le32_to_cpu (mc->priv.size)); goto err; }
@@ -970,7 +970,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,struct snd_sof_control *scontrol;int ret; -dev_dbg (scomp->dev,"tplg: load control type %d name : %s\n" , +dev_dbg (scomp->dev,"tplg: load control type %u name : %s\n" ,le32_to_cpu (hdr->type), hdr->name); scontrol =kzalloc_obj (*scontrol);
@@ -1015,7 +1015,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE :case SND_SOC_TPLG_DAPM_CTL_PIN :default : -dev_warn (scomp->dev,"control type not supported %d:%d:%d\n" , +dev_warn (scomp->dev,"control type not supported %u:%u:%u\n" ,le32_to_cpu (hdr->ops.get),le32_to_cpu (hdr->ops.put),le32_to_cpu (hdr->ops.info));
@@ -1525,7 +1525,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,break ;case snd_soc_dapm_pga:if (!le32_to_cpu (tw->num_kcontrols)) { -dev_err (scomp->dev,"invalid kcontrol count %d for volume\n" , +dev_err (scomp->dev,"invalid kcontrol count %u for volume\n" ,le32_to_cpu (tw->num_kcontrols)); ret = -EINVAL ;break ;
@@ -1774,7 +1774,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,ARRAY_SIZE (stream_tokens), private->array, le32_to_cpu(private->size));if (ret) { -dev_err (scomp->dev,"error: parse stream tokens failed %d\n" , +dev_err (scomp->dev,"error: parse stream tokens failed %u\n" ,le32_to_cpu (private->size));return ret; }
Signature · 1 line
2.37.2.352.g3c44437643
Mark Brown
maintainerQuoted 3 lines · Ben Dooks
The
pcm_idvalue is__le32so convert it before passing to thedev_dbgfunction to be printed. Also fixup some other uses of__le32data and a couple of places where %u should have been used instead of %d
Please rebase rather than resending this (if this is actually a rebase please send it as a v5 so the tooling doesn't get confused).
Quoted 7 lines · Mark Brown
Quoted 3 lines · Ben Dooks
The
pcm_idvalue is__le32so convert it before passing to thedev_dbgfunction to be printed. Also fixup some other uses of__le32data and a couple of places where %u should have been used instead of %dPlease rebase rather than resending this (if this is actually a rebase please send it as a v5 so the tooling doesn't get confused).
Sorry, fixed that with v5.
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html