ASoC: intel: rename soundwire codec helper functions

Rename SoundWire codec helper functions with "asoc_sdw" tag.

Link: https://github.com/thesofproject/linux/pull/5068
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-5-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bridge_cs35l56.c b/sound/soc/intel/boards/bridge_cs35l56.c
index 6b2526c781e5c5e86c074540d91fbdf919d4a9a7..55e5cfbb2f145a2e07d0b7407dd53bfd19aa1c8e 100644 (file)
--- a/sound/soc/intel/boards/bridge_cs35l56.c
+++ b/sound/soc/intel/boards/bridge_cs35l56.c
@@ -95,8 +95,8 @@ static const struct snd_soc_dai_link bridge_dai_template = {
        SND_SOC_DAILINK_REG(bridge_dai),
 };
 
-int bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
-                                int *num_dais, int *num_devs)
+int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
+                                         int *num_dais, int *num_devs)
 {
        if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {
                (*num_dais)++;
@@ -106,9 +106,9 @@ int bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
        return 0;
 }
 
-int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
-                              struct snd_soc_dai_link **dai_links,
-                              struct snd_soc_codec_conf **codec_conf)
+int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
+                                       struct snd_soc_dai_link **dai_links,
+                                       struct snd_soc_codec_conf **codec_conf)
 {
        if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {
                **dai_links = bridge_dai_template;
@@ -125,10 +125,10 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
        return 0;
 }
 
-int bridge_cs35l56_spk_init(struct snd_soc_card *card,
-                           struct snd_soc_dai_link *dai_links,
-                           struct asoc_sdw_codec_info *info,
-                           bool playback)
+int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,
+                                    struct snd_soc_dai_link *dai_links,
+                                    struct asoc_sdw_codec_info *info,
+                                    bool playback)
 {
        if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS)
                info->amp_num += ARRAY_SIZE(bridge_cs35l56_name_prefixes);

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 9395daf220e99d0b218ae72e959ad30afe7d84e7..64418976aba4171d9e6b3698410c246cafae8909 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -740,7 +740,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt700-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .rtd_init = rt700_rtd_init,
+                               .rtd_init = asoc_sdw_rt700_rtd_init,
                                .controls = rt700_controls,
                                .num_controls = ARRAY_SIZE(rt700_controls),
                                .widgets = rt700_widgets,
@@ -758,9 +758,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt711-sdca-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .init = sof_sdw_rt_sdca_jack_init,
-                               .exit = sof_sdw_rt_sdca_jack_exit,
-                               .rtd_init = rt_sdca_jack_rtd_init,
+                               .init = asoc_sdw_rt_sdca_jack_init,
+                               .exit = asoc_sdw_rt_sdca_jack_exit,
+                               .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -778,9 +778,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt711-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .init = sof_sdw_rt711_init,
-                               .exit = sof_sdw_rt711_exit,
-                               .rtd_init = rt711_rtd_init,
+                               .init = asoc_sdw_rt711_init,
+                               .exit = asoc_sdw_rt711_exit,
+                               .rtd_init = asoc_sdw_rt711_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -798,9 +798,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt712-sdca-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .init = sof_sdw_rt_sdca_jack_init,
-                               .exit = sof_sdw_rt_sdca_jack_exit,
-                               .rtd_init = rt_sdca_jack_rtd_init,
+                               .init = asoc_sdw_rt_sdca_jack_init,
+                               .exit = asoc_sdw_rt_sdca_jack_exit,
+                               .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -811,9 +811,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt712-sdca-aif2",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
-                               .init = sof_sdw_rt_amp_init,
-                               .exit = sof_sdw_rt_amp_exit,
-                               .rtd_init = rt712_spk_rtd_init,
+                               .init = asoc_sdw_rt_amp_init,
+                               .exit = asoc_sdw_rt_amp_exit,
+                               .rtd_init = asoc_sdw_rt712_spk_rtd_init,
                                .controls = generic_spk_controls,
                                .num_controls = ARRAY_SIZE(generic_spk_controls),
                                .widgets = generic_spk_widgets,
@@ -831,7 +831,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt712-sdca-dmic-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = rt_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
                        },
                },
                .dai_num = 1,
@@ -845,9 +845,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt712-sdca-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .init = sof_sdw_rt_sdca_jack_init,
-                               .exit = sof_sdw_rt_sdca_jack_exit,
-                               .rtd_init = rt_sdca_jack_rtd_init,
+                               .init = asoc_sdw_rt_sdca_jack_init,
+                               .exit = asoc_sdw_rt_sdca_jack_exit,
+                               .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -865,7 +865,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt712-sdca-dmic-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = rt_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
                        },
                },
                .dai_num = 1,
@@ -879,9 +879,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt1308-aif",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
-                               .init = sof_sdw_rt_amp_init,
-                               .exit = sof_sdw_rt_amp_exit,
-                               .rtd_init = rt_amp_spk_rtd_init,
+                               .init = asoc_sdw_rt_amp_init,
+                               .exit = asoc_sdw_rt_amp_exit,
+                               .rtd_init = asoc_sdw_rt_amp_spk_rtd_init,
                                .controls = generic_spk_controls,
                                .num_controls = ARRAY_SIZE(generic_spk_controls),
                                .widgets = generic_spk_widgets,
@@ -889,7 +889,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                        },
                },
                .dai_num = 1,
-               .ops = &sof_sdw_rt1308_i2s_ops,
+               .ops = &soc_sdw_rt1308_i2s_ops,
        },
        {
                .part_id = 0x1316,
@@ -899,9 +899,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt1316-aif",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
-                               .init = sof_sdw_rt_amp_init,
-                               .exit = sof_sdw_rt_amp_exit,
-                               .rtd_init = rt_amp_spk_rtd_init,
+                               .init = asoc_sdw_rt_amp_init,
+                               .exit = asoc_sdw_rt_amp_exit,
+                               .rtd_init = asoc_sdw_rt_amp_spk_rtd_init,
                                .controls = generic_spk_controls,
                                .num_controls = ARRAY_SIZE(generic_spk_controls),
                                .widgets = generic_spk_widgets,
@@ -918,9 +918,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt1318-aif",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
-                               .init = sof_sdw_rt_amp_init,
-                               .exit = sof_sdw_rt_amp_exit,
-                               .rtd_init = rt_amp_spk_rtd_init,
+                               .init = asoc_sdw_rt_amp_init,
+                               .exit = asoc_sdw_rt_amp_exit,
+                               .rtd_init = asoc_sdw_rt_amp_spk_rtd_init,
                                .controls = generic_spk_controls,
                                .num_controls = ARRAY_SIZE(generic_spk_controls),
                                .widgets = generic_spk_widgets,
@@ -939,7 +939,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt715-sdca-aif2",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = rt_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
                        },
                },
                .dai_num = 1,
@@ -954,7 +954,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt715-sdca-aif2",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = rt_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
                        },
                },
                .dai_num = 1,
@@ -969,7 +969,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt715-aif2",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = rt_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
                        },
                },
                .dai_num = 1,
@@ -984,7 +984,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt715-aif2",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = rt_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
                        },
                },
                .dai_num = 1,
@@ -998,9 +998,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt722-sdca-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .init = sof_sdw_rt_sdca_jack_init,
-                               .exit = sof_sdw_rt_sdca_jack_exit,
-                               .rtd_init = rt_sdca_jack_rtd_init,
+                               .init = asoc_sdw_rt_sdca_jack_init,
+                               .exit = asoc_sdw_rt_sdca_jack_exit,
+                               .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -1012,9 +1012,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                /* No feedback capability is provided by rt722-sdca codec driver*/
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
-                               .init = sof_sdw_rt_amp_init,
-                               .exit = sof_sdw_rt_amp_exit,
-                               .rtd_init = rt722_spk_rtd_init,
+                               .init = asoc_sdw_rt_amp_init,
+                               .exit = asoc_sdw_rt_amp_exit,
+                               .rtd_init = asoc_sdw_rt722_spk_rtd_init,
                                .controls = generic_spk_controls,
                                .num_controls = ARRAY_SIZE(generic_spk_controls),
                                .widgets = generic_spk_widgets,
@@ -1025,7 +1025,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt722-sdca-aif3",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = rt_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_rt_dmic_rtd_init,
                        },
                },
                .dai_num = 3,
@@ -1038,8 +1038,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "max98373-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
-                               .init = sof_sdw_maxim_init,
-                               .rtd_init = maxim_spk_rtd_init,
+                               .init = asoc_sdw_maxim_init,
+                               .rtd_init = asoc_sdw_maxim_spk_rtd_init,
                                .controls = maxim_controls,
                                .num_controls = ARRAY_SIZE(maxim_controls),
                                .widgets = maxim_widgets,
@@ -1056,8 +1056,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "max98363-aif1",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
-                               .init = sof_sdw_maxim_init,
-                               .rtd_init = maxim_spk_rtd_init,
+                               .init = asoc_sdw_maxim_init,
+                               .rtd_init = asoc_sdw_maxim_spk_rtd_init,
                                .controls = maxim_controls,
                                .num_controls = ARRAY_SIZE(maxim_controls),
                                .widgets = maxim_widgets,
@@ -1074,7 +1074,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "rt5682-sdw",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .rtd_init = rt5682_rtd_init,
+                               .rtd_init = asoc_sdw_rt5682_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -1091,8 +1091,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "cs35l56-sdw1",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
-                               .init = sof_sdw_cs_amp_init,
-                               .rtd_init = cs_spk_rtd_init,
+                               .init = asoc_sdw_cs_amp_init,
+                               .rtd_init = asoc_sdw_cs_spk_rtd_init,
                                .controls = generic_spk_controls,
                                .num_controls = ARRAY_SIZE(generic_spk_controls),
                                .widgets = generic_spk_widgets,
@@ -1109,7 +1109,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "cs42l42-sdw",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
-                               .rtd_init = cs42l42_rtd_init,
+                               .rtd_init = asoc_sdw_cs42l42_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -1121,15 +1121,15 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
        {
                .part_id = 0x4243,
                .codec_name = "cs42l43-codec",
-               .count_sidecar = bridge_cs35l56_count_sidecar,
-               .add_sidecar = bridge_cs35l56_add_sidecar,
+               .count_sidecar = asoc_sdw_bridge_cs35l56_count_sidecar,
+               .add_sidecar = asoc_sdw_bridge_cs35l56_add_sidecar,
                .dais = {
                        {
                                .direction = {true, false},
                                .dai_name = "cs42l43-dp5",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
-                               .rtd_init = cs42l43_hs_rtd_init,
+                               .rtd_init = asoc_sdw_cs42l43_hs_rtd_init,
                                .controls = generic_jack_controls,
                                .num_controls = ARRAY_SIZE(generic_jack_controls),
                                .widgets = generic_jack_widgets,
@@ -1140,7 +1140,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "cs42l43-dp1",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
-                               .rtd_init = cs42l43_dmic_rtd_init,
+                               .rtd_init = asoc_sdw_cs42l43_dmic_rtd_init,
                                .widgets = generic_dmic_widgets,
                                .num_widgets = ARRAY_SIZE(generic_dmic_widgets),
                        },
@@ -1155,8 +1155,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
                                .dai_name = "cs42l43-dp6",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
-                               .init = sof_sdw_cs42l43_spk_init,
-                               .rtd_init = cs42l43_spk_rtd_init,
+                               .init = asoc_sdw_cs42l43_spk_init,
+                               .rtd_init = asoc_sdw_cs42l43_spk_rtd_init,
                                .controls = generic_spk_controls,
                                .num_controls = ARRAY_SIZE(generic_spk_controls),
                                .widgets = generic_spk_widgets,
@@ -1220,7 +1220,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
        },
 };
 
-static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr)
+static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_part(const u64 adr)
 {
        unsigned int part_id, sdw_version;
        int i;
@@ -1241,7 +1241,7 @@ static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr)
 
 }
 
-static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
+static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_acpi(const u8 *acpi_id)
 {
        int i;
 
@@ -1255,8 +1255,8 @@ static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
        return NULL;
 }
 
-static struct asoc_sdw_codec_info *find_codec_info_dai(const char *dai_name,
-                                                      int *dai_index)
+static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_dai(const char *dai_name,
+                                                               int *dai_index)
 {
        int i, j;
 
@@ -1320,12 +1320,12 @@ static int init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai
        return 0;
 }
 
-static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
-                            unsigned int sdw_version,
-                            unsigned int mfg_id,
-                            unsigned int part_id,
-                            unsigned int class_id,
-                            int index_in_link)
+static bool asoc_sdw_is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
+                                     unsigned int sdw_version,
+                                     unsigned int mfg_id,
+                                     unsigned int part_id,
+                                     unsigned int class_id,
+                                     int index_in_link)
 {
        int i;
 
@@ -1354,10 +1354,10 @@ static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
        return true;
 }
 
-static const char *get_codec_name(struct device *dev,
-                                 const struct asoc_sdw_codec_info *codec_info,
-                                 const struct snd_soc_acpi_link_adr *adr_link,
-                                 int adr_index)
+static const char *asoc_sdw_get_codec_name(struct device *dev,
+                                          const struct asoc_sdw_codec_info *codec_info,
+                                          const struct snd_soc_acpi_link_adr *adr_link,
+                                          int adr_index)
 {
        u64 adr = adr_link->adr_d[adr_index].adr;
        unsigned int sdw_version = SDW_VERSION(adr);
@@ -1369,8 +1369,8 @@ static const char *get_codec_name(struct device *dev,
 
        if (codec_info->codec_name)
                return devm_kstrdup(dev, codec_info->codec_name, GFP_KERNEL);
-       else if (is_unique_device(adr_link, sdw_version, mfg_id, part_id,
-                                 class_id, adr_index))
+       else if (asoc_sdw_is_unique_device(adr_link, sdw_version, mfg_id, part_id,
+                                          class_id, adr_index))
                return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x",
                                      link_id, mfg_id, part_id, class_id);
        else
@@ -1380,7 +1380,7 @@ static const char *get_codec_name(struct device *dev,
        return NULL;
 }
 
-static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
+static int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
        struct asoc_sdw_codec_info *codec_info;
@@ -1390,7 +1390,7 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
        int i;
 
        for_each_rtd_codec_dais(rtd, i, dai) {
-               codec_info = find_codec_info_dai(dai->name, &dai_index);
+               codec_info = asoc_sdw_find_codec_info_dai(dai->name, &dai_index);
                if (!codec_info)
                        return -EINVAL;
 
@@ -1538,13 +1538,13 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
                                return -EINVAL;
                        }
 
-                       codec_info = find_codec_info_part(adr_dev->adr);
+                       codec_info = asoc_sdw_find_codec_info_part(adr_dev->adr);
                        if (!codec_info)
                                return -EINVAL;
 
                        ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic;
 
-                       codec_name = get_codec_name(dev, codec_info, adr_link, i);
+                       codec_name = asoc_sdw_get_codec_name(dev, codec_info, adr_link, i);
                        if (!codec_name)
                                return -ENOMEM;
 
@@ -1736,7 +1736,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
 
                init_dai_link(dev, *dai_links, be_id, name, playback, capture,
                              cpus, num_cpus, codecs, num_codecs,
-                             sof_sdw_rtd_init, &sdw_ops);
+                             asoc_sdw_rtd_init, &sdw_ops);
 
                /*
                 * SoundWire DAILINKs use 'stream' functions and Bank Switch operations
@@ -1831,7 +1831,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card,
        ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic01",
                                   0, 1, // DMIC only supports capture
                                   "DMIC01 Pin", "dmic-codec", "dmic-hifi",
-                                  sof_sdw_dmic_init, NULL);
+                                  asoc_sdw_dmic_init, NULL);
        if (ret)
                return ret;
 
@@ -1840,7 +1840,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card,
        ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic16k",
                                   0, 1, // DMIC only supports capture
                                   "DMIC16k Pin", "dmic-codec", "dmic-hifi",
-                                  /* don't call sof_sdw_dmic_init() twice */
+                                  /* don't call asoc_sdw_dmic_init() twice */
                                   NULL, NULL);
        if (ret)
                return ret;
@@ -1956,7 +1956,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
         * system only when I2S mode is supported, not sdw mode.
         * Here check ACPI ID to confirm I2S is supported.
         */
-       ssp_info = find_codec_info_acpi(mach->id);
+       ssp_info = asoc_sdw_find_codec_info_acpi(mach->id);
        if (ssp_info) {
                ssp_mask = SOF_SSP_GET_PORT(sof_sdw_quirk);
                ssp_num = hweight_long(ssp_mask);

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index e88b5627560b746fd4168a60f624a1de7115788e..28db2f1c6daeaddc5e8f3671d7f4062a91914f53 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -148,75 +148,75 @@ int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd);
 int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card);
 
 /* DMIC support */
-int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
+int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
 
 /* RT711 support */
-int sof_sdw_rt711_init(struct snd_soc_card *card,
-                      struct snd_soc_dai_link *dai_links,
-                      struct asoc_sdw_codec_info *info,
-                      bool playback);
-int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
+int asoc_sdw_rt711_init(struct snd_soc_card *card,
+                       struct snd_soc_dai_link *dai_links,
+                       struct asoc_sdw_codec_info *info,
+                       bool playback);
+int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
 
 /* RT711-SDCA support */
-int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
-                             struct snd_soc_dai_link *dai_links,
-                             struct asoc_sdw_codec_info *info,
-                             bool playback);
-int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
+int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
+                              struct snd_soc_dai_link *dai_links,
+                              struct asoc_sdw_codec_info *info,
+                              bool playback);
+int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
 
 /* RT1308 I2S support */
-extern const struct snd_soc_ops sof_sdw_rt1308_i2s_ops;
+extern const struct snd_soc_ops soc_sdw_rt1308_i2s_ops;
 
 /* generic amp support */
-int sof_sdw_rt_amp_init(struct snd_soc_card *card,
+int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
+                        struct snd_soc_dai_link *dai_links,
+                        struct asoc_sdw_codec_info *info,
+                        bool playback);
+int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
+
+/* MAXIM codec support */
+int asoc_sdw_maxim_init(struct snd_soc_card *card,
                        struct snd_soc_dai_link *dai_links,
                        struct asoc_sdw_codec_info *info,
                        bool playback);
-int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
-
-/* MAXIM codec support */
-int sof_sdw_maxim_init(struct snd_soc_card *card,
-                      struct snd_soc_dai_link *dai_links,
-                      struct asoc_sdw_codec_info *info,
-                      bool playback);
 
 /* CS42L43 support */
-int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
-                            struct snd_soc_dai_link *dai_links,
-                            struct asoc_sdw_codec_info *info,
-                            bool playback);
+int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,
+                             struct snd_soc_dai_link *dai_links,
+                             struct asoc_sdw_codec_info *info,
+                             bool playback);
 
 /* CS AMP support */
-int bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
-                                int *num_dais, int *num_devs);
-int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
-                              struct snd_soc_dai_link **dai_links,
-                              struct snd_soc_codec_conf **codec_conf);
-int bridge_cs35l56_spk_init(struct snd_soc_card *card,
-                           struct snd_soc_dai_link *dai_links,
-                           struct asoc_sdw_codec_info *info,
-                           bool playback);
-
-int sof_sdw_cs_amp_init(struct snd_soc_card *card,
-                       struct snd_soc_dai_link *dai_links,
-                       struct asoc_sdw_codec_info *info,
-                       bool playback);
+int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
+                                         int *num_dais, int *num_devs);
+int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
+                                       struct snd_soc_dai_link **dai_links,
+                                       struct snd_soc_codec_conf **codec_conf);
+int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,
+                                    struct snd_soc_dai_link *dai_links,
+                                    struct asoc_sdw_codec_info *info,
+                                    bool playback);
+
+int asoc_sdw_cs_amp_init(struct snd_soc_card *card,
+                        struct snd_soc_dai_link *dai_links,
+                        struct asoc_sdw_codec_info *info,
+                        bool playback);
 
 /* dai_link init callbacks */
 
-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);
+int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_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
index fc18e4aa3dbe9fec68b391cd3e84a98dc00688c8..d28477c5046909d45b7c8f2b4609010342ba4a50 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs42l42.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l42.c
@@ -36,7 +36,7 @@ static struct snd_soc_jack_pin cs42l42_jack_pins[] = {
        },
 };
 
-int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_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
index 1688f29a977a1497ebaaba3c2e2b9a9d347fa783..bb371b2649cf39bbf860283c908ff66505312b80 100644 (file)
--- 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, struct snd_soc_dai *dai)
+int asoc_sdw_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, struct snd_soc_dai *dai
        return ret;
 }
 
-int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
        struct snd_soc_card *card = rtd->card;
        int ret;
@@ -121,10 +121,10 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da
        return ret;
 }
 
-int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
-                            struct snd_soc_dai_link *dai_links,
-                            struct asoc_sdw_codec_info *info,
-                            bool playback)
+int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,
+                             struct snd_soc_dai_link *dai_links,
+                             struct asoc_sdw_codec_info *info,
+                             bool playback)
 {
        /* Do init on playback link only. */
        if (!playback)
@@ -132,10 +132,10 @@ int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
 
        info->amp_num++;
 
-       return bridge_cs35l56_spk_init(card, dai_links, info, playback);
+       return asoc_sdw_bridge_cs35l56_spk_init(card, dai_links, info, playback);
 }
 
-int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_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
index 206fe7610a5630ce703646c539a1435b28685a3f..6479974bd2c3b5bd12f8b3a8277cc0933aa49b4f 100644 (file)
--- 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, struct snd_soc_dai *dai)
+int asoc_sdw_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;
@@ -45,10 +45,10 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
        return 0;
 }
 
-int sof_sdw_cs_amp_init(struct snd_soc_card *card,
-                       struct snd_soc_dai_link *dai_links,
-                       struct asoc_sdw_codec_info *info,
-                       bool playback)
+int asoc_sdw_cs_amp_init(struct snd_soc_card *card,
+                        struct snd_soc_dai_link *dai_links,
+                        struct asoc_sdw_codec_info *info,
+                        bool playback)
 {
        /* Do init on playback link only. */
        if (!playback)

diff --git a/sound/soc/intel/boards/sof_sdw_dmic.c b/sound/soc/intel/boards/sof_sdw_dmic.c
index 19df0f7a1d85aff7ad75252e782d6f69bf9f35a3..d9f2e072f40114cbc81bd1830733f33a711bdf06 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_dmic.c
+++ b/sound/soc/intel/boards/sof_sdw_dmic.c
@@ -19,7 +19,7 @@ static const struct snd_soc_dapm_route dmic_map[] = {
        {"DMic", NULL, "SoC DMIC"},
 };
 
-int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd)
+int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
        int ret;

diff --git a/sound/soc/intel/boards/sof_sdw_maxim.c b/sound/soc/intel/boards/sof_sdw_maxim.c
index f689dc29c493efbd4d39336f437a25372d937b55..fd8347e2884998ac545431e1441411a35fe043ff 100644 (file)
--- 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, struct snd_soc_dai *dai)
+int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
        struct snd_soc_card *card = rtd->card;
        int ret;
@@ -75,7 +75,7 @@ static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enabl
        return 0;
 }
 
-static int mx8373_sdw_prepare(struct snd_pcm_substream *substream)
+static int asoc_sdw_mx8373_prepare(struct snd_pcm_substream *substream)
 {
        int ret;
 
@@ -87,7 +87,7 @@ static int mx8373_sdw_prepare(struct snd_pcm_substream *substream)
        return mx8373_enable_spk_pin(substream, true);
 }
 
-static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream)
+static int asoc_sdw_mx8373_hw_free(struct snd_pcm_substream *substream)
 {
        int ret;
 
@@ -101,14 +101,14 @@ static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream)
 
 static const struct snd_soc_ops max_98373_sdw_ops = {
        .startup = asoc_sdw_startup,
-       .prepare = mx8373_sdw_prepare,
+       .prepare = asoc_sdw_mx8373_prepare,
        .trigger = asoc_sdw_trigger,
        .hw_params = asoc_sdw_hw_params,
-       .hw_free = mx8373_sdw_hw_free,
+       .hw_free = asoc_sdw_mx8373_hw_free,
        .shutdown = asoc_sdw_shutdown,
 };
 
-static int mx8373_sdw_late_probe(struct snd_soc_card *card)
+static int asoc_sdw_mx8373_sdw_late_probe(struct snd_soc_card *card)
 {
        struct snd_soc_dapm_context *dapm = &card->dapm;
 
@@ -118,10 +118,10 @@ static int mx8373_sdw_late_probe(struct snd_soc_card *card)
        return snd_soc_dapm_sync(dapm);
 }
 
-int sof_sdw_maxim_init(struct snd_soc_card *card,
-                      struct snd_soc_dai_link *dai_links,
-                      struct asoc_sdw_codec_info *info,
-                      bool playback)
+int asoc_sdw_maxim_init(struct snd_soc_card *card,
+                       struct snd_soc_dai_link *dai_links,
+                       struct asoc_sdw_codec_info *info,
+                       bool playback)
 {
        info->amp_num++;
 
@@ -133,7 +133,7 @@ int sof_sdw_maxim_init(struct snd_soc_card *card,
                 */
                break;
        case SOF_SDW_PART_ID_MAX98373:
-               info->codec_card_late_probe = mx8373_sdw_late_probe;
+               info->codec_card_late_probe = asoc_sdw_mx8373_sdw_late_probe;
                dai_links->ops = &max_98373_sdw_ops;
                break;
        default:

diff --git a/sound/soc/intel/boards/sof_sdw_rt5682.c b/sound/soc/intel/boards/sof_sdw_rt5682.c
index 67737815d016ea3517fd4a2e5af575fb422f2695..3584638e21923c88754cdc6bcd9ca30cf9fee696 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt5682.c
+++ b/sound/soc/intel/boards/sof_sdw_rt5682.c
@@ -35,7 +35,7 @@ static struct snd_soc_jack_pin rt5682_jack_pins[] = {
        },
 };
 
-int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_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
index 0db730071be23657fc729f72d8e43b2b4c557471..a90d69573736def1eee882e80dfb1ad862969f47 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt700.c
+++ b/sound/soc/intel/boards/sof_sdw_rt700.c
@@ -33,7 +33,7 @@ static struct snd_soc_jack_pin rt700_jack_pins[] = {
        },
 };
 
-int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_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
index fff76291fca20e54f1ace6a07fa3b6f32320fc4f..e4d300d7d5ef54753a48ea61ed9a348b63722307 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt711.c
+++ b/sound/soc/intel/boards/sof_sdw_rt711.c
@@ -59,7 +59,7 @@ static struct snd_soc_jack_pin rt711_jack_pins[] = {
        },
 };
 
-int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_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);
@@ -111,7 +111,7 @@ int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
        return ret;
 }
 
-int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
+int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
 {
        struct mc_private *ctx = snd_soc_card_get_drvdata(card);
 
@@ -124,10 +124,10 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l
        return 0;
 }
 
-int sof_sdw_rt711_init(struct snd_soc_card *card,
-                      struct snd_soc_dai_link *dai_links,
-                      struct asoc_sdw_codec_info *info,
-                      bool playback)
+int asoc_sdw_rt711_init(struct snd_soc_card *card,
+                       struct snd_soc_dai_link *dai_links,
+                       struct asoc_sdw_codec_info *info,
+                       bool playback)
 {
        struct mc_private *ctx = snd_soc_card_get_drvdata(card);
        struct device *sdw_dev;

diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
index 78879646188585b487931151305903fa1ffa0be6..bb09d1ddafd242d635d0641cbc2b34dc51f56693 100644 (file)
--- 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, struct snd_soc_dai *dai)
+int asoc_sdw_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
index 083d281bd05253f96aa257c50e8ac9c27f696804..2da9134ad1a38e8238e845d1736253eafe4304f5 100644 (file)
--- 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, struct snd_soc_dai *dai)
+int asoc_sdw_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
index da1a8cc1c63d06ae4028d9b865a349306c559788..4cf392c84cc7fdea303be1856b258ac15fa5ea4d 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_amp.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_amp.c
@@ -173,7 +173,7 @@ 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, struct snd_soc_dai *dai)
+int asoc_sdw_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;
@@ -233,11 +233,11 @@ static int rt1308_i2s_hw_params(struct snd_pcm_substream *substream,
 }
 
 /* machine stream operations */
-const struct snd_soc_ops sof_sdw_rt1308_i2s_ops = {
+const struct snd_soc_ops soc_sdw_rt1308_i2s_ops = {
        .hw_params = rt1308_i2s_hw_params,
 };
 
-int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
+int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
 {
        struct mc_private *ctx = snd_soc_card_get_drvdata(card);
 
@@ -254,10 +254,10 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_
        return 0;
 }
 
-int sof_sdw_rt_amp_init(struct snd_soc_card *card,
-                       struct snd_soc_dai_link *dai_links,
-                       struct asoc_sdw_codec_info *info,
-                       bool playback)
+int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
+                        struct snd_soc_dai_link *dai_links,
+                        struct asoc_sdw_codec_info *info,
+                        bool playback)
 {
        struct mc_private *ctx = snd_soc_card_get_drvdata(card);
        struct device *sdw_dev1, *sdw_dev2;

diff --git a/sound/soc/intel/boards/sof_sdw_rt_dmic.c b/sound/soc/intel/boards/sof_sdw_rt_dmic.c
index ea7c1a4bc5661e88493c90d015de083107a6d824..64960b059834a81d540841336e7305dbcafe805f 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_dmic.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_dmic.c
@@ -12,7 +12,7 @@
 #include "sof_board_helpers.h"
 #include "sof_sdw_common.h"
 
-int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_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
index 9c3b93f808a21145939568bc82342c59adf204aa..d84aec2b4c789428ca3400ca73f9c2ef555ae855 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
@@ -83,7 +83,7 @@ static const char * const need_sdca_suffix[] = {
        "rt711", "rt713"
 };
 
-int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+int asoc_sdw_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);
@@ -161,7 +161,7 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *d
        return ret;
 }
 
-int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
+int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
 {
        struct mc_private *ctx = snd_soc_card_get_drvdata(card);
 
@@ -178,10 +178,10 @@ int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link
        return 0;
 }
 
-int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
-                             struct snd_soc_dai_link *dai_links,
-                             struct asoc_sdw_codec_info *info,
-                             bool playback)
+int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
+                              struct snd_soc_dai_link *dai_links,
+                              struct asoc_sdw_codec_info *info,
+                              bool playback)
 {
        struct mc_private *ctx = snd_soc_card_get_drvdata(card);
        struct device *sdw_dev;