ASoC: Intel: sof_sdw_max98373: change sof_sdw_mx8373_late_probe to static call

sof_sdw_mx8373_late_probe is only used in sof_sdw_max98373,
so it should be static and rename it to 'mx8373_sdw_late_probe'.

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230419195524.46995-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index 4962dc11a088e1f7431ae075fe72217fc4129352..081ab7eac5b618bdb4a21e8ebd937428848d180d 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -158,8 +158,6 @@ int sof_sdw_mx8373_init(struct snd_soc_card *card,
                        struct sof_sdw_codec_info *info,
                        bool playback);
 
-int sof_sdw_mx8373_late_probe(struct snd_soc_card *card);
-
 /* RT5682 support */
 int sof_sdw_rt5682_init(struct snd_soc_card *card,
                        const struct snd_soc_acpi_link_adr *link,

diff --git a/sound/soc/intel/boards/sof_sdw_max98373.c b/sound/soc/intel/boards/sof_sdw_max98373.c
index 22bd1e356e2221fe408b1f59a45606f7e4e5afb0..3d7df58c0f1d1bbbb61acbbc5452a7b4af871720 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_max98373.c
+++ b/sound/soc/intel/boards/sof_sdw_max98373.c
@@ -120,6 +120,16 @@ static const struct snd_soc_ops max_98373_sdw_ops = {
        .shutdown = sdw_shutdown,
 };
 
+static int mx8373_sdw_late_probe(struct snd_soc_card *card)
+{
+       struct snd_soc_dapm_context *dapm = &card->dapm;
+
+       /* Disable Left and Right Spk pin after boot */
+       snd_soc_dapm_disable_pin(dapm, "Left Spk");
+       snd_soc_dapm_disable_pin(dapm, "Right Spk");
+       return snd_soc_dapm_sync(dapm);
+}
+
 int sof_sdw_mx8373_init(struct snd_soc_card *card,
                        const struct snd_soc_acpi_link_adr *link,
                        struct snd_soc_dai_link *dai_links,
@@ -130,19 +140,9 @@ int sof_sdw_mx8373_init(struct snd_soc_card *card,
        if (info->amp_num == 2)
                dai_links->init = spk_init;
 
-       info->codec_card_late_probe = sof_sdw_mx8373_late_probe;
+       info->codec_card_late_probe = mx8373_sdw_late_probe;
 
        dai_links->ops = &max_98373_sdw_ops;
 
        return 0;
 }
-
-int sof_sdw_mx8373_late_probe(struct snd_soc_card *card)
-{
-       struct snd_soc_dapm_context *dapm = &card->dapm;
-
-       /* Disable Left and Right Spk pin after boot */
-       snd_soc_dapm_disable_pin(dapm, "Left Spk");
-       snd_soc_dapm_disable_pin(dapm, "Right Spk");
-       return snd_soc_dapm_sync(dapm);
-}