Skip to content

Commit 13231df

Browse files
vijendarmukundagregkh
authored andcommitted
ASoC: amd: acp: fix for cpu dai index logic
[ Upstream commit 7ce8e4d ] Multi link aggregation is not supported for acp6.3 platform. Below combinations are supported. - one sdw BE DAI <---> one-cpu DAI <---> one-codec DAI - one sdw BE DAI <---> one-cpu DAI <---> multi-codec DAIs As Single cpu dai is going to be created, In create_sdw_dailink() function cpu dai index won't be incremented. Refactor cpu dai index logic to fix below smatch static checker warning. sound/soc/amd/acp/acp-sdw-sof-mach.c:157 create_sdw_dailink() warn: iterator 'i' not incremented. Reported-by: Dan Carpenter <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/T/ Fixes: 6d8348d ("ASoC: amd: acp: refactor SoundWire machine driver code") Signed-off-by: Vijendar Mukunda <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 3c56866 commit 13231df

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

sound/soc/amd/acp/acp-sdw-sof-mach.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
154154
int num_cpus = hweight32(sof_dai->link_mask[stream]);
155155
int num_codecs = sof_dai->num_devs[stream];
156156
int playback, capture;
157-
int i = 0, j = 0;
157+
int j = 0;
158158
char *name;
159159

160160
if (!sof_dai->num_devs[stream])
@@ -213,14 +213,14 @@ static int create_sdw_dailink(struct snd_soc_card *card,
213213

214214
int link_num = ffs(sof_end->link_mask) - 1;
215215

216-
cpus[i].dai_name = devm_kasprintf(dev, GFP_KERNEL,
217-
"SDW%d Pin%d",
218-
link_num, cpu_pin_id);
219-
dev_dbg(dev, "cpu[%d].dai_name:%s\n", i, cpus[i].dai_name);
220-
if (!cpus[i].dai_name)
216+
cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
217+
"SDW%d Pin%d",
218+
link_num, cpu_pin_id);
219+
dev_dbg(dev, "cpu->dai_name:%s\n", cpus->dai_name);
220+
if (!cpus->dai_name)
221221
return -ENOMEM;
222222

223-
codec_maps[j].cpu = i;
223+
codec_maps[j].cpu = 0;
224224
codec_maps[j].codec = j;
225225

226226
codecs[j].name = sof_end->codec_name;

0 commit comments

Comments
 (0)