Skip to content

Commit 06b830b

Browse files
yongzhi1broonie
authored andcommitted
ASoC: Intel: sof_sdw: remove late_probe flag in struct sof_sdw_codec_info
Just use codec_card_late_probe ptr in struct sof_sdw_codec_info for validation check and drop late_probe variable. Signed-off-by: Yong Zhi <yong.zhi@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20230419195524.46995-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent f5460a1 commit 06b830b

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

sound/soc/intel/boards/sof_sdw.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
621621
.direction = {true, true},
622622
.dai_name = "max98373-aif1",
623623
.init = sof_sdw_mx8373_init,
624-
.codec_card_late_probe = sof_sdw_mx8373_late_probe,
625624
.codec_type = SOF_SDW_CODEC_TYPE_AMP,
626625
},
627626
{
@@ -1490,12 +1489,12 @@ static int sof_sdw_card_late_probe(struct snd_soc_card *card)
14901489
int i;
14911490

14921491
for (i = 0; i < ARRAY_SIZE(codec_info_list); i++) {
1493-
if (!codec_info_list[i].late_probe)
1494-
continue;
1492+
if (codec_info_list[i].codec_card_late_probe) {
1493+
ret = codec_info_list[i].codec_card_late_probe(card);
14951494

1496-
ret = codec_info_list[i].codec_card_late_probe(card);
1497-
if (ret < 0)
1498-
return ret;
1495+
if (ret < 0)
1496+
return ret;
1497+
}
14991498
}
15001499

15011500
if (ctx->idisp_codec)

sound/soc/intel/boards/sof_sdw_common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ struct sof_sdw_codec_info {
7474
bool playback);
7575

7676
int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
77-
bool late_probe;
7877
int (*codec_card_late_probe)(struct snd_soc_card *card);
7978
};
8079

sound/soc/intel/boards/sof_sdw_max98373.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ int sof_sdw_mx8373_init(struct snd_soc_card *card,
130130
if (info->amp_num == 2)
131131
dai_links->init = spk_init;
132132

133-
info->late_probe = true;
133+
info->codec_card_late_probe = sof_sdw_mx8373_late_probe;
134134

135135
dai_links->ops = &max_98373_sdw_ops;
136136

0 commit comments

Comments
 (0)