[alsa-devel] [asoc:for-5.4 438/441] sound/soc/sof/sof-pci-dev.c:136:15: error: 'snd_soc_acpi_intel_cml_machines' undeclared here (not in a function); did you mean 'snd_soc_acpi_intel_cnl_machines'?

[Pierre-Louis Bossart]

On 11/16/19 8:02 PM, kbuild test robot wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
> head:   fe23be2d85b05f561431d75acddec726ea807d2a
> commit: 130d3e90777fe974e4b8fa100cec8faf19cac998 [438/441] ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names.
> config: i386-randconfig-c002-20191117 (attached as .config)
> compiler: gcc-7 (Debian 7.4.0-14) 7.4.0
> reproduce:
>          git checkout 130d3e90777fe974e4b8fa100cec8faf19cac998
>          # save the attached .config to linux build tree
>          make ARCH=i386
> 
> If you fix the issue, kindly add following tag
> Reported-by: kbuild test robot <lkp at intel.com>
> 
> All errors (new ones prefixed by >>):
> 
>>> sound/soc/sof/sof-pci-dev.c:136:15: error: 'snd_soc_acpi_intel_cml_machines' undeclared here (not in a function); did you mean 'snd_soc_acpi_intel_cnl_machines'?
>       .machines  = snd_soc_acpi_intel_cml_machines,
>                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>                    snd_soc_acpi_intel_cnl_machines

Looks like the for-5.4 branch did not pick up all the patches from the 
series [PATCH 0/3] ASoC: Intel/SOF: split CFL, CNL, CML firmware names​

it's missing:
[PATCH 1/3] ASoC: Intel: acpi-match: split CNL tables in three
[PATCH 3/3] ASoC: SOF: Intel: hda: use fallback for firmware name


> 
> vim +136 sound/soc/sof/sof-pci-dev.c
> 
>     131	
>     132	#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) || \
>     133		IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)
>     134	
>     135	static const struct sof_dev_desc cml_desc = {
>   > 136		.machines		= snd_soc_acpi_intel_cml_machines,
>     137		.resindex_lpe_base	= 0,
>     138		.resindex_pcicfg_base	= -1,
>     139		.resindex_imr_base	= -1,
>     140		.irqindex_host_ipc	= -1,
>     141		.resindex_dma_base	= -1,
>     142		.chip_info = &cnl_chip_info,
>     143		.default_fw_path = "intel/sof",
>     144		.default_tplg_path = "intel/sof-tplg",
>     145		.nocodec_fw_filename = "sof-cml.ri",
>     146		.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
>     147		.ops = &sof_cnl_ops,
>     148		.arch_ops = &sof_xtensa_arch_ops
>     149	};
>     150	#endif
>     151	
> 
> ---
> 0-DAY kernel test infrastructure                 Open Source Technology Center
> https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org Intel Corporation
>