ASoC: Intel: Drop legacy HSW/BDW board-match information

With board-matching information for legacy solution moved to local
directory, there is no need to expose it globally.

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220815165818.3050649-5-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index bc7fd46..14d7839 100644 (file)
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -14,7 +14,6 @@
  * these tables are not constants, some fields can be used for
  * pdata or machine ops
  */
-extern struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[];

diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
index cbcb649..6daf60b 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
@@ -9,40 +9,25 @@
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
 
-struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[] = {
-       {
-               .id = "INT33CA",
-               .drv_name = "hsw_rt5640",
-               .fw_filename = "intel/IntcSST1.bin",
-               .sof_tplg_filename = "sof-hsw.tplg",
-       },
-       {}
-};
-EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_haswell_machines);
-
 struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = {
        {
                .id = "INT343A",
                .drv_name = "bdw_rt286",
-               .fw_filename =  "intel/IntcSST2.bin",
                .sof_tplg_filename = "sof-bdw-rt286.tplg",
        },
        {
                .id = "10EC5650",
                .drv_name = "bdw-rt5650",
-               .fw_filename = "intel/IntcSST2.bin",
                .sof_tplg_filename = "sof-bdw-rt5650.tplg",
        },
        {
                .id = "RT5677CE",
                .drv_name = "bdw-rt5677",
-               .fw_filename =  "intel/IntcSST2.bin",
                .sof_tplg_filename = "sof-bdw-rt5677.tplg",
        },
        {
                .id = "INT33CA",
                .drv_name = "hsw_rt5640",
-               .fw_filename = "intel/IntcSST2.bin",
                .sof_tplg_filename = "sof-bdw-rt5640.tplg",
        },
        {}