Unverified Commit 84aa440e authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: Don't pass acpi_link_adr to init functions 



There is no need to pass the snd_soc_acpi_link_adr structure to the init
functions, it conveys no specific information about the codec. Remove
this parameter from the callbacks

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240326160429.13560-32-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent aac976aa

sound/soc/intel/boards/sof_sdw.c

+2 −5
Original line number Diff line number Diff line
@@ -1273,7 +1273,6 @@ struct sof_sdw_endpoint { 
	u32 link_mask;

	const char *codec_name;



	const struct snd_soc_acpi_link_adr *adr_link;

	struct sof_sdw_codec_info *codec_info;

	const struct sof_sdw_dai_info *dai_info;

};
@@ -1425,7 +1424,6 @@ static int parse_sdw_endpoints(struct snd_soc_card *card, 


				sof_end->link_mask = adr_link->mask;

				sof_end->codec_name = codec_name;

				sof_end->adr_link = adr_link;

				sof_end->codec_info = codec_info;

				sof_end->dai_info = dai_info;

				sof_end++;
@@ -1548,8 +1546,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, 


		list_for_each_entry(sof_end, &sof_dai->endpoints, list) {

			if (sof_end->dai_info->init)

				sof_end->dai_info->init(card, sof_end->adr_link,

							*dai_links,

				sof_end->dai_info->init(card, *dai_links,

							sof_end->codec_info,

							playback);

		}
@@ -1612,7 +1609,7 @@ static int create_ssp_dailinks(struct snd_soc_card *card, 
		if (ret)

			return ret;



		ret = ssp_info->dais[0].init(card, NULL, *dai_links, ssp_info, 0);

		ret = ssp_info->dais[0].init(card, *dai_links, ssp_info, 0);

		if (ret < 0)

			return ret;

sound/soc/intel/boards/sof_sdw_common.h

+0 −6
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ struct sof_sdw_dai_info { 
	const int dai_type;

	const int dailink[2]; /* dailink id for each direction */

	int  (*init)(struct snd_soc_card *card,

		     const struct snd_soc_acpi_link_adr *link,

		     struct snd_soc_dai_link *dai_links,

		     struct sof_sdw_codec_info *info,

		     bool playback);
@@ -132,7 +131,6 @@ int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd); 


/* RT711 support */

int sof_sdw_rt711_init(struct snd_soc_card *card,

		       const struct snd_soc_acpi_link_adr *link,

		       struct snd_soc_dai_link *dai_links,

		       struct sof_sdw_codec_info *info,

		       bool playback);
@@ -140,7 +138,6 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l 


/* RT711-SDCA support */

int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,

			      const struct snd_soc_acpi_link_adr *link,

			      struct snd_soc_dai_link *dai_links,

			      struct sof_sdw_codec_info *info,

			      bool playback);
@@ -151,7 +148,6 @@ extern struct snd_soc_ops sof_sdw_rt1308_i2s_ops; 


/* generic amp support */

int sof_sdw_rt_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);
@@ -159,14 +155,12 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_ 


/* MAXIM codec support */

int sof_sdw_maxim_init(struct snd_soc_card *card,

		       const struct snd_soc_acpi_link_adr *link,

		       struct snd_soc_dai_link *dai_links,

		       struct sof_sdw_codec_info *info,

		       bool playback);



/* CS AMP support */

int sof_sdw_cs_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);

sound/soc/intel/boards/sof_sdw_cs_amp.c

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd) 
}



int sof_sdw_cs_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback)

sound/soc/intel/boards/sof_sdw_maxim.c

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ static int mx8373_sdw_late_probe(struct snd_soc_card *card) 
}



int sof_sdw_maxim_init(struct snd_soc_card *card,

		       const struct snd_soc_acpi_link_adr *link,

		       struct snd_soc_dai_link *dai_links,

		       struct sof_sdw_codec_info *info,

		       bool playback)

sound/soc/intel/boards/sof_sdw_rt711.c

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l 
}



int sof_sdw_rt711_init(struct snd_soc_card *card,

		       const struct snd_soc_acpi_link_adr *link,

		       struct snd_soc_dai_link *dai_links,

		       struct sof_sdw_codec_info *info,

		       bool playback)