mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-16 00:46:47 +07:00
ASoC: SOF - remove the dead code (skylake/kabylake)
Appearently the CONFIG_SND_SOC_SOF_KABYLAKE and CONFIG_SND_SOC_SOF_SKYLAKE options are not present in Kconfig and 'struct snd_sof_dsp_ops sof_skl_ops' is not declared in the code, too. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20191028173329.29538-1-perex@perex.cz Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
d745cc1ab6
commit
c3ad1092e1
@ -608,7 +608,6 @@ extern struct snd_soc_dai_driver skl_dai[];
|
||||
*/
|
||||
extern const struct snd_sof_dsp_ops sof_apl_ops;
|
||||
extern const struct snd_sof_dsp_ops sof_cnl_ops;
|
||||
extern const struct snd_sof_dsp_ops sof_skl_ops;
|
||||
|
||||
extern const struct sof_intel_dsp_desc apl_chip_info;
|
||||
extern const struct sof_intel_dsp_desc cnl_chip_info;
|
||||
|
@ -173,42 +173,6 @@ static const struct sof_dev_desc icl_desc = {
|
||||
};
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
|
||||
static const struct sof_dev_desc skl_desc = {
|
||||
.machines = snd_soc_acpi_intel_skl_machines,
|
||||
.resindex_lpe_base = 0,
|
||||
.resindex_pcicfg_base = -1,
|
||||
.resindex_imr_base = -1,
|
||||
.irqindex_host_ipc = -1,
|
||||
.resindex_dma_base = -1,
|
||||
.chip_info = &skl_chip_info,
|
||||
.default_fw_path = "intel/sof",
|
||||
.default_tplg_path = "intel/sof-tplg",
|
||||
.nocodec_fw_filename = "sof-skl.ri",
|
||||
.nocodec_tplg_filename = "sof-skl-nocodec.tplg",
|
||||
.ops = &sof_skl_ops,
|
||||
.arch_ops = &sof_xtensa_arch_ops
|
||||
};
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
|
||||
static const struct sof_dev_desc kbl_desc = {
|
||||
.machines = snd_soc_acpi_intel_kbl_machines,
|
||||
.resindex_lpe_base = 0,
|
||||
.resindex_pcicfg_base = -1,
|
||||
.resindex_imr_base = -1,
|
||||
.irqindex_host_ipc = -1,
|
||||
.resindex_dma_base = -1,
|
||||
.chip_info = &skl_chip_info,
|
||||
.default_fw_path = "intel/sof",
|
||||
.default_tplg_path = "intel/sof-tplg",
|
||||
.nocodec_fw_filename = "sof-kbl.ri",
|
||||
.nocodec_tplg_filename = "sof-kbl-nocodec.tplg",
|
||||
.ops = &sof_skl_ops,
|
||||
.arch_ops = &sof_xtensa_arch_ops
|
||||
};
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)
|
||||
static const struct sof_dev_desc tgl_desc = {
|
||||
.machines = snd_soc_acpi_intel_tgl_machines,
|
||||
@ -431,14 +395,6 @@ static const struct pci_device_id sof_pci_ids[] = {
|
||||
{ PCI_DEVICE(0x8086, 0xa348),
|
||||
.driver_data = (unsigned long)&cfl_desc},
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
|
||||
{ PCI_DEVICE(0x8086, 0x9d71),
|
||||
.driver_data = (unsigned long)&kbl_desc},
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
|
||||
{ PCI_DEVICE(0x8086, 0x9d70),
|
||||
.driver_data = (unsigned long)&skl_desc},
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)
|
||||
{ PCI_DEVICE(0x8086, 0x34C8),
|
||||
.driver_data = (unsigned long)&icl_desc},
|
||||
|
Loading…
Reference in New Issue
Block a user