From: Pierre-Louis Bossart Date: Mon, 18 Jun 2018 18:29:36 +0000 (-0500) Subject: ASoC: Intel: Skylake: cleanup before moving ACPI tables X-Git-Tag: v5.15~7441^2~18^2~516 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f15f267daf81a4c7c2a1cd2a0d6743ec7fc8b59;p=platform%2Fkernel%2Flinux-starfive.git 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: Pierre-Louis Bossart Signed-off-by: Mark Brown --- diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 0a8f076..6dec748 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -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 */