Skip to content

Commit 207fd1f

Browse files
bjdooks-ctbroonie
authored andcommitted
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 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>
1 parent 49c0022 commit 207fd1f

5 files changed

Lines changed: 23 additions & 17 deletions

File tree

sound/soc/sof/compress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ static int sof_compr_set_params(struct snd_soc_component *component,
248248
ipc_params_reply.posn_offset);
249249
if (ret < 0) {
250250
dev_err(component->dev, "Invalid stream data offset for Compr %d\n",
251-
spcm->pcm.pcm_id);
251+
le32_to_cpu(spcm->pcm.pcm_id));
252252
goto out;
253253
}
254254

sound/soc/sof/ipc4-topology.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@ sof_ipc4_update_card_components_string(struct snd_sof_widget *swidget,
581581
struct snd_soc_component *scomp = spcm->scomp;
582582
struct snd_soc_card *card = scomp->card;
583583
const char *pt_marker = "iec61937-pcm";
584+
unsigned pcm_id = le32_to_cpu(spcm->pcm.pcm_id);
584585

585586
/*
586587
* 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,
595596

596597
if (strstr(card->components, pt_marker))
597598
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
598-
"%s,%d",
599+
"%s,%u",
599600
card->components,
600-
spcm->pcm.pcm_id);
601+
pcm_id);
601602
else
602603
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
603-
"%s %s:%d",
604+
"%s %s:%u",
604605
card->components,
605606
pt_marker,
606-
spcm->pcm.pcm_id);
607+
pcm_id);
607608

608609
devm_kfree(card->dev, tmp);
609610
} else {
610611
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
611-
"%s:%d", pt_marker,
612-
spcm->pcm.pcm_id);
612+
"%s:%u", pt_marker,
613+
pcm_id);
613614
}
614615

615616
if (!card->components)

sound/soc/sof/pcm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ static int sof_pcm_prepare(struct snd_soc_component *component,
361361
ret = sof_widget_list_setup(sdev, spcm, params, platform_params, dir);
362362
if (ret < 0) {
363363
dev_err(sdev->dev, "failed widget list set up for pcm %d dir %d\n",
364-
spcm->pcm.pcm_id, dir);
364+
le32_to_cpu(spcm->pcm.pcm_id), dir);
365365
spcm->stream[dir].list = NULL;
366366
snd_soc_dapm_dai_free_widgets(&list);
367367
return ret;
@@ -652,7 +652,7 @@ static int sof_pcm_new(struct snd_soc_component *component,
652652
}
653653

654654
dev_dbg(spcm->scomp->dev, "pcm%u (%s): Entry: pcm_construct\n",
655-
spcm->pcm.pcm_id, spcm->pcm.pcm_name);
655+
le32_to_cpu(spcm->pcm.pcm_id), spcm->pcm.pcm_name);
656656

657657
/* do we need to pre-allocate playback audio buffer pages */
658658
if (!spcm->pcm.playback)

sound/soc/sof/sof-audio.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,17 +641,20 @@ void snd_sof_pcm_init_elapsed_work(struct work_struct *work);
641641
*/
642642
#define spcm_dbg(__spcm, __dir, __fmt, ...) \
643643
dev_dbg((__spcm)->scomp->dev, "pcm%u (%s), dir %d: " __fmt, \
644-
(__spcm)->pcm.pcm_id, (__spcm)->pcm.pcm_name, __dir, \
644+
le32_to_cpu((__spcm)->pcm.pcm_id), \
645+
(__spcm)->pcm.pcm_name, __dir, \
645646
##__VA_ARGS__)
646647

647648
#define spcm_dbg_ratelimited(__spcm, __dir, __fmt, ...) \
648649
dev_dbg_ratelimited((__spcm)->scomp->dev, "pcm%u (%s), dir %d: " __fmt, \
649-
(__spcm)->pcm.pcm_id, (__spcm)->pcm.pcm_name, __dir, \
650-
##__VA_ARGS__)
650+
le32_to_cpu((__spcm)->pcm.pcm_id), \
651+
(__spcm)->pcm.pcm_name, __dir, \
652+
##__VA_ARGS__)
651653

652654
#define spcm_err(__spcm, __dir, __fmt, ...) \
653655
dev_err((__spcm)->scomp->dev, "%s: pcm%u (%s), dir %d: " __fmt, \
654-
__func__, (__spcm)->pcm.pcm_id, (__spcm)->pcm.pcm_name, __dir, \
656+
__func__, le32_to_cpu((__spcm)->pcm.pcm_id), \
657+
(__spcm)->pcm.pcm_name, __dir, \
655658
##__VA_ARGS__)
656659

657660
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMPRESS)

sound/soc/sof/topology.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ static int sof_parse_token_sets(struct snd_soc_component *scomp,
776776
break;
777777
default:
778778
dev_err(scomp->dev, "error: unknown token type %d\n",
779-
array->type);
779+
le32_to_cpu(array->type));
780780
return -EINVAL;
781781
}
782782

@@ -971,7 +971,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
971971
int ret;
972972

973973
dev_dbg(scomp->dev, "tplg: load control type %d name : %s\n",
974-
hdr->type, hdr->name);
974+
le32_to_cpu(hdr->type), hdr->name);
975975

976976
scontrol = kzalloc_obj(*scontrol);
977977
if (!scontrol)
@@ -1016,7 +1016,9 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
10161016
case SND_SOC_TPLG_DAPM_CTL_PIN:
10171017
default:
10181018
dev_warn(scomp->dev, "control type not supported %d:%d:%d\n",
1019-
hdr->ops.get, hdr->ops.put, hdr->ops.info);
1019+
le32_to_cpu(hdr->ops.get),
1020+
le32_to_cpu(hdr->ops.put),
1021+
le32_to_cpu(hdr->ops.info));
10201022
kfree(scontrol->name);
10211023
kfree(scontrol);
10221024
return 0;
@@ -1524,7 +1526,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
15241526
case snd_soc_dapm_pga:
15251527
if (!le32_to_cpu(tw->num_kcontrols)) {
15261528
dev_err(scomp->dev, "invalid kcontrol count %d for volume\n",
1527-
tw->num_kcontrols);
1529+
le32_to_cpu(tw->num_kcontrols));
15281530
ret = -EINVAL;
15291531
break;
15301532
}

0 commit comments

Comments
 (0)