Unverified Commit 579d6596 authored Feb 08, 2024 by Bard Liao Committed by Mark Brown Feb 08, 2024

ASoC: Intel: sof_sdw: remove .init callbacks



Some codec .init callbacks are empty after removing dai_links->init =
xxx_rtd_init;. Remove those callbacks.

Reviewed-by: Rander Wang <rander.wang@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/20240208165545.93811-19-pierre-louis.bossart@linux.intel.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 8266c731

sound/soc/intel/boards/sof_sdw.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -650,7 +650,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt700-aif1",
		.dai_type = SOF_SDW_DAI_TYPE_JACK,
		.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
		.init = sof_sdw_rt700_init,
		.rtd_init = rt700_rtd_init,
		},
		},
		@@ -706,7 +705,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt712-sdca-aif2",
		.dai_type = SOF_SDW_DAI_TYPE_AMP,
		.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},
		.init = sof_sdw_rt712_spk_init,
		.rtd_init = rt712_spk_rtd_init,
		},
		},
		@@ -721,7 +719,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt712-sdca-dmic-aif1",
		.dai_type = SOF_SDW_DAI_TYPE_MIC,
		.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
		.init = sof_sdw_rt712_sdca_dmic_init,
		.rtd_init = rt712_sdca_dmic_rtd_init,
		},
		},
		@@ -752,7 +749,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt712-sdca-dmic-aif1",
		.dai_type = SOF_SDW_DAI_TYPE_MIC,
		.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
		.init = sof_sdw_rt712_sdca_dmic_init,
		.rtd_init = rt712_sdca_dmic_rtd_init,
		},
		},
		@@ -815,7 +811,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt715-aif2",
		.dai_type = SOF_SDW_DAI_TYPE_MIC,
		.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
		.init = sof_sdw_rt715_sdca_init,
		.rtd_init = rt715_sdca_rtd_init,
		},
		},
		@@ -831,7 +826,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt715-aif2",
		.dai_type = SOF_SDW_DAI_TYPE_MIC,
		.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
		.init = sof_sdw_rt715_sdca_init,
		.rtd_init = rt715_sdca_rtd_init,
		},
		},
		@@ -847,7 +841,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt715-aif2",
		.dai_type = SOF_SDW_DAI_TYPE_MIC,
		.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
		.init = sof_sdw_rt715_init,
		.rtd_init = rt715_rtd_init,
		},
		},
		@@ -863,7 +856,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt715-aif2",
		.dai_type = SOF_SDW_DAI_TYPE_MIC,
		.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
		.init = sof_sdw_rt715_init,
		.rtd_init = rt715_rtd_init,
		},
		},
		@@ -935,7 +927,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "rt5682-sdw",
		.dai_type = SOF_SDW_DAI_TYPE_JACK,
		.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
		.init = sof_sdw_rt5682_init,
		.rtd_init = rt5682_rtd_init,
		},
		},
		@@ -963,7 +954,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "cs42l42-sdw",
		.dai_type = SOF_SDW_DAI_TYPE_JACK,
		.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
		.init = sof_sdw_cs42l42_init,
		.rtd_init = cs42l42_rtd_init,
		},
		},
		@@ -978,7 +968,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "cs42l43-dp5",
		.dai_type = SOF_SDW_DAI_TYPE_JACK,
		.dailink = {SDW_JACK_OUT_DAI_ID, SDW_UNUSED_DAI_ID},
		.init = sof_sdw_cs42l43_hs_init,
		.rtd_init = cs42l43_hs_rtd_init,
		},
		{
		@@ -986,7 +975,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
		.dai_name = "cs42l43-dp1",
		.dai_type = SOF_SDW_DAI_TYPE_MIC,
		.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
		.init = sof_sdw_cs42l43_dmic_init,
		.rtd_init = cs42l43_dmic_rtd_init,
		},
		{

sound/soc/intel/boards/sof_sdw_cs42l42.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -121,20 +121,4 @@ int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)

		return ret;
		}

		int sof_sdw_cs42l42_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)
		{
		/*
		* headset should be initialized once.
		* Do it with dai link for playback.
		*/
		if (!playback)
		return 0;

		return 0;
		}
		MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);

sound/soc/intel/boards/sof_sdw_cs42l43.c

+0 −18

Original line number	Diff line number	Diff line
		@@ -108,18 +108,6 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)
		return ret;
		}

		int sof_sdw_cs42l43_hs_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)
		{
		/*
		* No need to test if (!playback) like other codecs as cs42l43 uses separated dai for
		* playback and capture, and sof_sdw_cs42l43_init is only linked to the playback dai.
		*/

		return 0;
		}

		int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_soc_card *card = rtd->card;
		@@ -145,9 +133,3 @@ int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
		return ret;
		}

		int sof_sdw_cs42l43_dmic_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)
		{
		return 0;
		}

sound/soc/intel/boards/sof_sdw_rt5682.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -120,20 +120,4 @@ int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd)

		return ret;
		}

		int sof_sdw_rt5682_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)
		{
		/*
		* headset should be initialized once.
		* Do it with dai link for playback.
		*/
		if (!playback)
		return 0;

		return 0;
		}
		MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);

sound/soc/intel/boards/sof_sdw_rt700.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -119,20 +119,4 @@ int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd)

		return ret;
		}

		int sof_sdw_rt700_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)
		{
		/*
		* headset should be initialized once.
		* Do it with dai link for playback.
		*/
		if (!playback)
		return 0;

		return 0;
		}
		MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);