ASoC: SOF: Move sof_of_machine_select() to sof-of-dev.c from sof-audio.c

Move the sof_of_machine_select() function to sof-of-dev.c file and provide
an inline stub in case of non OF builds.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20231129125327.23708-2-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 563fe6f7789f735eb68aa1ead4aac6ec9df63297..2198bb8e92c358d69de43872d856ab081347d71e 100644 (file)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -990,28 +990,6 @@ int sof_dai_get_bclk(struct snd_soc_pcm_runtime *rtd)
 }
 EXPORT_SYMBOL(sof_dai_get_bclk);
 
-static struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev)
-{
-       struct snd_sof_pdata *sof_pdata = sdev->pdata;
-       const struct sof_dev_desc *desc = sof_pdata->desc;
-       struct snd_sof_of_mach *mach = desc->of_machines;
-
-       if (!mach)
-               return NULL;
-
-       for (; mach->compatible; mach++) {
-               if (of_machine_is_compatible(mach->compatible)) {
-                       sof_pdata->tplg_filename = mach->sof_tplg_filename;
-                       if (mach->fw_filename)
-                               sof_pdata->fw_filename = mach->fw_filename;
-
-                       return mach;
-               }
-       }
-
-       return NULL;
-}
-
 /*
  * SOF Driver enumeration.
  */

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c
index c6be8a91e74b053b59436957cb080963f9647cff..432b511bf8c4a1aacaef78b40bb4ee896161b516 100644 (file)
--- a/sound/soc/sof/sof-of-dev.c
+++ b/sound/soc/sof/sof-of-dev.c
@@ -41,6 +41,29 @@ static void sof_of_probe_complete(struct device *dev)
        pm_runtime_enable(dev);
 }
 
+struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev)
+{
+       struct snd_sof_pdata *sof_pdata = sdev->pdata;
+       const struct sof_dev_desc *desc = sof_pdata->desc;
+       struct snd_sof_of_mach *mach = desc->of_machines;
+
+       if (!mach)
+               return NULL;
+
+       for (; mach->compatible; mach++) {
+               if (of_machine_is_compatible(mach->compatible)) {
+                       sof_pdata->tplg_filename = mach->sof_tplg_filename;
+                       if (mach->fw_filename)
+                               sof_pdata->fw_filename = mach->fw_filename;
+
+                       return mach;
+               }
+       }
+
+       return NULL;
+}
+EXPORT_SYMBOL(sof_of_machine_select);
+
 int sof_of_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;

diff --git a/sound/soc/sof/sof-of-dev.h b/sound/soc/sof/sof-of-dev.h
index b6cc70595f3bf174682e70b0ea3f5fc958f2545b..547e358a37e3b473af64103f4c9a44a7874a731e 100644 (file)
--- a/sound/soc/sof/sof-of-dev.h
+++ b/sound/soc/sof/sof-of-dev.h
@@ -16,6 +16,15 @@ struct snd_sof_of_mach {
        const char *sof_tplg_filename;
 };
 
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_OF_DEV)
+struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev);
+#else
+static inline struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev)
+{
+       return NULL;
+}
+#endif
+
 extern const struct dev_pm_ops sof_of_pm;
 
 int sof_of_probe(struct platform_device *pdev);