ASoC: SOF: Intel: hda: read multi-link capabilities earlier

There's no reason to delay the multi-link parsing, this can be done
earlier before checking the SoundWire capabilities.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20221111042653.45520-9-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 2f9d69e640915f1713ad761f907934f6e9647c13..14a2f8701350cf81537b76928bb7b4564827e1e0 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -944,6 +944,8 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
                return ret;
        }
 
+       hda_bus_ml_get_capabilities(bus);
+
        /* scan SoundWire capabilities exposed by DSDT */
        ret = hda_sdw_acpi_scan(sdev);
        if (ret < 0) {
@@ -972,8 +974,6 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
 
 skip_soundwire:
 
-       hda_bus_ml_get_capabilities(bus);
-
        /* create codec instances */
        hda_codec_probe_bus(sdev);