Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jaroslav Kysela and committed by
Mark Brown
c3ad1092 d745cc1a

-45
-1
sound/soc/sof/intel/hda.h
··· 608 608 */ 609 609 extern const struct snd_sof_dsp_ops sof_apl_ops; 610 610 extern const struct snd_sof_dsp_ops sof_cnl_ops; 611 - extern const struct snd_sof_dsp_ops sof_skl_ops; 612 611 613 612 extern const struct sof_intel_dsp_desc apl_chip_info; 614 613 extern const struct sof_intel_dsp_desc cnl_chip_info;
-44
sound/soc/sof/sof-pci-dev.c
··· 173 173 }; 174 174 #endif 175 175 176 - #if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE) 177 - static const struct sof_dev_desc skl_desc = { 178 - .machines = snd_soc_acpi_intel_skl_machines, 179 - .resindex_lpe_base = 0, 180 - .resindex_pcicfg_base = -1, 181 - .resindex_imr_base = -1, 182 - .irqindex_host_ipc = -1, 183 - .resindex_dma_base = -1, 184 - .chip_info = &skl_chip_info, 185 - .default_fw_path = "intel/sof", 186 - .default_tplg_path = "intel/sof-tplg", 187 - .nocodec_fw_filename = "sof-skl.ri", 188 - .nocodec_tplg_filename = "sof-skl-nocodec.tplg", 189 - .ops = &sof_skl_ops, 190 - .arch_ops = &sof_xtensa_arch_ops 191 - }; 192 - #endif 193 - 194 - #if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE) 195 - static const struct sof_dev_desc kbl_desc = { 196 - .machines = snd_soc_acpi_intel_kbl_machines, 197 - .resindex_lpe_base = 0, 198 - .resindex_pcicfg_base = -1, 199 - .resindex_imr_base = -1, 200 - .irqindex_host_ipc = -1, 201 - .resindex_dma_base = -1, 202 - .chip_info = &skl_chip_info, 203 - .default_fw_path = "intel/sof", 204 - .default_tplg_path = "intel/sof-tplg", 205 - .nocodec_fw_filename = "sof-kbl.ri", 206 - .nocodec_tplg_filename = "sof-kbl-nocodec.tplg", 207 - .ops = &sof_skl_ops, 208 - .arch_ops = &sof_xtensa_arch_ops 209 - }; 210 - #endif 211 - 212 176 #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) 213 177 static const struct sof_dev_desc tgl_desc = { 214 178 .machines = snd_soc_acpi_intel_tgl_machines, ··· 394 430 #if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE) 395 431 { PCI_DEVICE(0x8086, 0xa348), 396 432 .driver_data = (unsigned long)&cfl_desc}, 397 - #endif 398 - #if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE) 399 - { PCI_DEVICE(0x8086, 0x9d71), 400 - .driver_data = (unsigned long)&kbl_desc}, 401 - #endif 402 - #if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE) 403 - { PCI_DEVICE(0x8086, 0x9d70), 404 - .driver_data = (unsigned long)&skl_desc}, 405 433 #endif 406 434 #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) 407 435 { PCI_DEVICE(0x8086, 0x34C8),