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>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 782b45adb21e2d27df5b9122f254394462bc3e04..801cfe9c4dd3b5d900ebe151336cab90d812561e 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -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,
                        },
                        {

diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c
index 5d0915b72c7fbbdeb76b34a35a3f44f6c0c4b7ce..0dc297f7de0112f0ef0e659a62dcc429d2f5ce55 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs42l42.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l42.c
@@ -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);

diff --git a/sound/soc/intel/boards/sof_sdw_cs42l43.c b/sound/soc/intel/boards/sof_sdw_cs42l43.c
index 7909ea9c9c14199ddb97b2e2472a56d611a5591a..a9b6edac2ecd537bbebff2e166a46df25058ebd4 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs42l43.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l43.c
@@ -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;
-}

diff --git a/sound/soc/intel/boards/sof_sdw_rt5682.c b/sound/soc/intel/boards/sof_sdw_rt5682.c
index 4e3fcc8610742c93eeb87821d4a6cdbb4ff66f8d..6b008a5a343bcd9288683f287a048e7a07ca53cf 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt5682.c
+++ b/sound/soc/intel/boards/sof_sdw_rt5682.c
@@ -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);

diff --git a/sound/soc/intel/boards/sof_sdw_rt700.c b/sound/soc/intel/boards/sof_sdw_rt700.c
index 781d41e35191f27bbdf665031431ba7ae6a4e011..88e785a54b16fb73376294d070294a7c41a03e4c 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt700.c
+++ b/sound/soc/intel/boards/sof_sdw_rt700.c
@@ -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);

diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
index dddb27e4c943f06d4658f40fe375211e56095d25..ebb4b58c198b9572f3339e04078c0e2c9f4e8fbe 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
@@ -67,15 +67,6 @@ int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        return ret;
 }
 
-int sof_sdw_rt712_spk_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;
-}
-
 static const char * const dmics[] = {
        "rt712-sdca-dmic"
 };
@@ -99,13 +90,4 @@ int rt712_sdca_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
 
        return 0;
 }
-
-int sof_sdw_rt712_sdca_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;
-}
 MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);

diff --git a/sound/soc/intel/boards/sof_sdw_rt715.c b/sound/soc/intel/boards/sof_sdw_rt715.c
index 19194fe92b8e1055b75d3bc0a2b8292deb56855f..b5a886cd595dc6d23c1eedf81bf5988a5fe5d483 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt715.c
+++ b/sound/soc/intel/boards/sof_sdw_rt715.c
@@ -24,11 +24,3 @@ int rt715_rtd_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
 
-int sof_sdw_rt715_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;
-}

diff --git a/sound/soc/intel/boards/sof_sdw_rt715_sdca.c b/sound/soc/intel/boards/sof_sdw_rt715_sdca.c
index 3089fa8450fa830d70c1b04b1b9279b50061b0d6..4b37a8a6dd2e27c83a456c76cb3800fedd79bfdf 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt715_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt715_sdca.c
@@ -24,11 +24,3 @@ int rt715_sdca_rtd_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
 
-int sof_sdw_rt715_sdca_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;
-}