Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5f15f267 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: cleanup before moving ACPI tables 



There is no need to deal with DMICs if the DSP is not present and
there is no ACPI machine ID found.

Simplify before moving these ACPI tables to sound/soc/intel/common

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 95555f58

sound/soc/intel/skylake/skl.c

+4 −4
Original line number Diff line number Diff line
@@ -500,10 +500,12 @@ static int skl_find_machine(struct skl *skl, void *driver_data) 


	skl->mach = mach;

	skl->fw_name = mach->fw_filename;

	pdata = skl->mach->pdata;

	pdata = mach->pdata;



	if (mach->pdata)

	if (pdata) {

		skl->use_tplg_pcm = pdata->use_tplg_pcm;

		pdata->dmic_num = skl_get_dmic_geo(skl);

	}



	return 0;

}
@@ -930,8 +932,6 @@ static int skl_probe(struct pci_dev *pci, 


	pci_set_drvdata(skl->pci, ebus);



	skl_dmic_data.dmic_num = skl_get_dmic_geo(skl);



	/* check if dsp is there */

	if (bus->ppcap) {

		/* create device for dsp clk */