Unverified Commit 06b830bd authored by Yong Zhi's avatar Yong Zhi Committed by Mark Brown
Browse files

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: default avatarYong Zhi <yong.zhi@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard 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: default avatarMark Brown <broonie@kernel.org>
parent f5460a15

sound/soc/intel/boards/sof_sdw.c

+5 −6
Original line number Diff line number Diff line
@@ -621,7 +621,6 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
		.direction = {true, true},

		.dai_name = "max98373-aif1",

		.init = sof_sdw_mx8373_init,

		.codec_card_late_probe = sof_sdw_mx8373_late_probe,

		.codec_type = SOF_SDW_CODEC_TYPE_AMP,

	},

	{
@@ -1490,13 +1489,13 @@ static int sof_sdw_card_late_probe(struct snd_soc_card *card) 
	int i;



	for (i = 0; i < ARRAY_SIZE(codec_info_list); i++) {

		if (!codec_info_list[i].late_probe)

			continue;



		if (codec_info_list[i].codec_card_late_probe) {

			ret = codec_info_list[i].codec_card_late_probe(card);



			if (ret < 0)

				return ret;

		}

	}



	if (ctx->idisp_codec)

		ret = sof_sdw_hdmi_card_late_probe(card);

sound/soc/intel/boards/sof_sdw_common.h

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ struct sof_sdw_codec_info { 
		     bool playback);



	int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);

	bool late_probe;

	int (*codec_card_late_probe)(struct snd_soc_card *card);

};

sound/soc/intel/boards/sof_sdw_max98373.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int sof_sdw_mx8373_init(struct snd_soc_card *card, 
	if (info->amp_num == 2)

		dai_links->init = spk_init;



	info->late_probe = true;

	info->codec_card_late_probe = sof_sdw_mx8373_late_probe;



	dai_links->ops = &max_98373_sdw_ops;