[alsa-devel] [PATCH] ASoC: SOF - remove the dead code (skylake/kabylake)

[Pierre-Louis Bossart]

On 10/28/19 12:33 PM, Jaroslav Kysela wrote:
> 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 at perex.cz>
> Cc: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
> Cc: Mark Brown <broonie at kernel.org>

Right, but there is still a plan to "at some point" support those 
platforms.
I don't mind if we remove this code, just be aware that it'll come back.

> ---
>   sound/soc/sof/intel/hda.h   |  1 -
>   sound/soc/sof/sof-pci-dev.c | 44 -------------------------------------
>   2 files changed, 45 deletions(-)
> 
> diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
> index 23e430d3e056..f521c48ec2eb 100644
> --- a/sound/soc/sof/intel/hda.h
> +++ b/sound/soc/sof/intel/hda.h
> @@ -596,7 +596,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;
> diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
> index 3a9e0e2a150d..bca3fb791a6b 100644
> --- a/sound/soc/sof/sof-pci-dev.c
> +++ b/sound/soc/sof/sof-pci-dev.c
> @@ -168,42 +168,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,
> @@ -407,14 +371,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},
>