ASoC: Intel: sof_sdw: add dai parameter to rtd_init callback

bardliao · broonie · commit 84e0a19adb73 · 2024-05-10T07:11:50.000+01:00
A generic .rtd_init() callback could be used by different dais. It is useful to pass dai parameter to the callback. The dai parameter will be used in the follow up commit. No functional change here. Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20240509163418.67746-18-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
@@ -1411,7 +1411,7 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 
 skip_add_controls_widgets:
 		if (codec_info->dais[dai_index].rtd_init) {
-			ret = codec_info->dais[dai_index].rtd_init(rtd);
+			ret = codec_info->dais[dai_index].rtd_init(rtd, dai);
 			if (ret)
 				return ret;
 		}
diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
@@ -95,7 +95,7 @@ struct sof_sdw_dai_info {
 		     struct sof_sdw_codec_info *info,
 		     bool playback);
 	int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
-	int (*rtd_init)(struct snd_soc_pcm_runtime *rtd);
+	int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 	bool rtd_init_done; /* Indicate that the rtd_init callback is done */
 	unsigned long quirk;
 };
@@ -208,19 +208,19 @@ int sof_sdw_cs_amp_init(struct snd_soc_card *card,
 
 /* dai_link init callbacks */
 
-int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);
-int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd);
+int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 
 #endif
diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c
@@ -40,7 +40,7 @@ static const char * const jack_codecs[] = {
 	"cs42l42"
 };
 
-int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	struct mc_private *ctx = snd_soc_card_get_drvdata(card);
diff --git a/sound/soc/intel/boards/sof_sdw_cs42l43.c b/sound/soc/intel/boards/sof_sdw_cs42l43.c
@@ -48,7 +48,7 @@ static struct snd_soc_jack_pin sof_jack_pins[] = {
 	},
 };
 
-int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
 	struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card);
@@ -99,7 +99,7 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)
 	return ret;
 }
 
-int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	int ret;
@@ -135,7 +135,7 @@ int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
 	return bridge_cs35l56_spk_init(card, dai_links, info, playback);
 }
 
-int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	int ret;
diff --git a/sound/soc/intel/boards/sof_sdw_cs_amp.c b/sound/soc/intel/boards/sof_sdw_cs_amp.c
@@ -14,7 +14,7 @@
 
 #define CODEC_NAME_SIZE	8
 
-int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	const char *dai_name = rtd->dai_link->codecs->dai_name;
 	struct snd_soc_card *card = rtd->card;
diff --git a/sound/soc/intel/boards/sof_sdw_maxim.c b/sound/soc/intel/boards/sof_sdw_maxim.c
@@ -21,7 +21,7 @@ static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {
 	{ "Right Spk", NULL, "Right BE_OUT" },
 };
 
-int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	int ret;
diff --git a/sound/soc/intel/boards/sof_sdw_rt5682.c b/sound/soc/intel/boards/sof_sdw_rt5682.c
@@ -39,7 +39,7 @@ static const char * const jack_codecs[] = {
 	"rt5682"
 };
 
-int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	struct mc_private *ctx = snd_soc_card_get_drvdata(card);
diff --git a/sound/soc/intel/boards/sof_sdw_rt700.c b/sound/soc/intel/boards/sof_sdw_rt700.c
@@ -37,7 +37,7 @@ static const char * const jack_codecs[] = {
 	"rt700"
 };
 
-int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	struct mc_private *ctx = snd_soc_card_get_drvdata(card);
diff --git a/sound/soc/intel/boards/sof_sdw_rt711.c b/sound/soc/intel/boards/sof_sdw_rt711.c
@@ -63,7 +63,7 @@ static const char * const jack_codecs[] = {
 	"rt711"
 };
 
-int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	struct mc_private *ctx = snd_soc_card_get_drvdata(card);
diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
@@ -26,7 +26,7 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {
 	{ "Speaker", NULL, "rt712 SPOR" },
 };
 
-int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	int ret;
diff --git a/sound/soc/intel/boards/sof_sdw_rt722_sdca.c b/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
@@ -19,7 +19,7 @@ static const struct snd_soc_dapm_route rt722_spk_map[] = {
 	{ "Speaker", NULL, "rt722 SPK" },
 };
 
-int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	int ret;
diff --git a/sound/soc/intel/boards/sof_sdw_rt_amp.c b/sound/soc/intel/boards/sof_sdw_rt_amp.c
@@ -177,12 +177,12 @@ static const struct snd_soc_dapm_route *get_codec_name_and_route(struct snd_soc_
 		return rt1318_map;
 }
 
-int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	const struct snd_soc_dapm_route *rt_amp_map;
 	char codec_name[CODEC_NAME_SIZE];
-	struct snd_soc_dai *dai;
+	struct snd_soc_dai *codec_dai;
 	int ret;
 	int i;
 
@@ -194,10 +194,10 @@ int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
 	if (!card->components)
 		return -ENOMEM;
 
-	for_each_rtd_codec_dais(rtd, i, dai) {
-		if (strstr(dai->component->name_prefix, "-1"))
+	for_each_rtd_codec_dais(rtd, i, codec_dai) {
+		if (strstr(codec_dai->component->name_prefix, "-1"))
 			ret = snd_soc_dapm_add_routes(&card->dapm, rt_amp_map, 2);
-		else if (strstr(dai->component->name_prefix, "-2"))
+		else if (strstr(codec_dai->component->name_prefix, "-2"))
 			ret = snd_soc_dapm_add_routes(&card->dapm, rt_amp_map + 2, 2);
 	}
 
diff --git a/sound/soc/intel/boards/sof_sdw_rt_dmic.c b/sound/soc/intel/boards/sof_sdw_rt_dmic.c
@@ -19,7 +19,7 @@ static const char * const dmics[] = {
 	"rt722-sdca",
 };
 
-int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	struct snd_soc_component *component;
diff --git a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
@@ -87,7 +87,7 @@ static const char * const need_sdca_suffix[] = {
 	"rt711", "rt713"
 };
 
-int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd)
+int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_card *card = rtd->card;
 	struct mc_private *ctx = snd_soc_card_get_drvdata(card);

Original file line number	Diff line number	Diff line change
`@@ -1411,7 +1411,7 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)`
`1411`	`1411`
`1412`	`1412`	`skip_add_controls_widgets:`
`1413`	`1413`	`if (codec_info->dais[dai_index].rtd_init) {`
`1414`		`- ret = codec_info->dais[dai_index].rtd_init(rtd);`
	`1414`	`+ ret = codec_info->dais[dai_index].rtd_init(rtd, dai);`
`1415`	`1415`	`if (ret)`
`1416`	`1416`	`return ret;`
`1417`	`1417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ static const char * const jack_codecs[] = {`
`40`	`40`	`"cs42l42"`
`41`	`41`	`};`
`42`	`42`
`43`		`-int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`43`	`+int cs42l42_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`44`	`44`	`{`
`45`	`45`	`struct snd_soc_card *card = rtd->card;`
`46`	`46`	`struct mc_private *ctx = snd_soc_card_get_drvdata(card);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static struct snd_soc_jack_pin sof_jack_pins[] = {`
`48`	`48`	`},`
`49`	`49`	`};`
`50`	`50`
`51`		`-int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`51`	`+int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`52`	`52`	`{`
`53`	`53`	`struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;`
`54`	`54`	`struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card);`
`@@ -99,7 +99,7 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)`
`99`	`99`	`return ret;`
`100`	`100`	`}`
`101`	`101`
`102`		`-int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`102`	`+int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`103`	`103`	`{`
`104`	`104`	`struct snd_soc_card *card = rtd->card;`
`105`	`105`	`int ret;`
`@@ -135,7 +135,7 @@ int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,`
`135`	`135`	`return bridge_cs35l56_spk_init(card, dai_links, info, playback);`
`136`	`136`	`}`
`137`	`137`
`138`		`-int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`138`	`+int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`139`	`139`	`{`
`140`	`140`	`struct snd_soc_card *card = rtd->card;`
`141`	`141`	`int ret;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`#define CODEC_NAME_SIZE 8`
`16`	`16`
`17`		`-int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`17`	`+int cs_spk_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`18`	`18`	`{`
`19`	`19`	`const char *dai_name = rtd->dai_link->codecs->dai_name;`
`20`	`20`	`struct snd_soc_card *card = rtd->card;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {`
`21`	`21`	`{ "Right Spk", NULL, "Right BE_OUT" },`
`22`	`22`	`};`
`23`	`23`
`24`		`-int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`24`	`+int maxim_spk_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`25`	`25`	`{`
`26`	`26`	`struct snd_soc_card *card = rtd->card;`
`27`	`27`	`int ret;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ static const char * const jack_codecs[] = {`
`39`	`39`	`"rt5682"`
`40`	`40`	`};`
`41`	`41`
`42`		`-int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`42`	`+int rt5682_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`43`	`43`	`{`
`44`	`44`	`struct snd_soc_card *card = rtd->card;`
`45`	`45`	`struct mc_private *ctx = snd_soc_card_get_drvdata(card);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static const char * const jack_codecs[] = {`
`37`	`37`	`"rt700"`
`38`	`38`	`};`
`39`	`39`
`40`		`-int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`40`	`+int rt700_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`41`	`41`	`{`
`42`	`42`	`struct snd_soc_card *card = rtd->card;`
`43`	`43`	`struct mc_private *ctx = snd_soc_card_get_drvdata(card);`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static const char * const jack_codecs[] = {`
`63`	`63`	`"rt711"`
`64`	`64`	`};`
`65`	`65`
`66`		`-int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`66`	`+int rt711_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`67`	`67`	`{`
`68`	`68`	`struct snd_soc_card *card = rtd->card;`
`69`	`69`	`struct mc_private *ctx = snd_soc_card_get_drvdata(card);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {`
`26`	`26`	`{ "Speaker", NULL, "rt712 SPOR" },`
`27`	`27`	`};`
`28`	`28`
`29`		`-int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)`
	`29`	`+int rt712_spk_rtd_init(struct snd_soc_pcm_runtime rtd, struct snd_soc_dai dai)`
`30`	`30`	`{`
`31`	`31`	`struct snd_soc_card *card = rtd->card;`
`32`	`32`	`int ret;`