[SRU][J][PATCH 15/17] ASoC: intel: sof_sdw: remove sof_sdw_mic_codec_mockup_init
Hui Wang
hui.wang at canonical.com
Fri Nov 19 11:46:03 UTC 2021
From: Bard Liao <yung-chuan.liao at linux.intel.com>
BugLink: https://bugs.launchpad.net/bugs/1951563
Now, we set DAI link id as SDW_DMIC_DAI_ID for all DMICs.
No need to set it in sof_sdw_mic_codec_mockup_init.
Signed-off-by: Bard Liao <yung-chuan.liao at linux.intel.com>
Link: https://lore.kernel.org/r/20211027021824.24776-9-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie at kernel.org>
(cherry picked from commit bd98394a811c7dc39bcd189cf5f33925f0c30ae2 linux-next)
Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
sound/soc/intel/boards/sof_sdw.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 2f435088f7d1..bdc15769014f 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -410,20 +410,6 @@ static const struct snd_soc_ops sdw_ops = {
.shutdown = sdw_shutdown,
};
-static int sof_sdw_mic_codec_mockup_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)
-{
- /*
- * force DAI link to use same ID as RT715 and DMIC
- * to reuse topologies
- */
- dai_links->id = SDW_DMIC_DAI_ID;
- return 0;
-}
-
static struct sof_sdw_codec_info codec_info_list[] = {
{
.part_id = 0x700,
@@ -546,7 +532,6 @@ static struct sof_sdw_codec_info codec_info_list[] = {
.version_id = 0,
.direction = {false, true},
.dai_name = "sdw-mockup-aif1",
- .init = sof_sdw_mic_codec_mockup_init,
.codec_type = SOF_SDW_CODEC_TYPE_MIC,
},
};
--
2.25.1
More information about the kernel-team
mailing list