Skip to content

Commit

Permalink
ASoC: Intel: Skylake: cleanup before moving ACPI tables
Browse files Browse the repository at this point in the history
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 <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
plbossart authored and broonie committed Jun 19, 2018
1 parent 95555f5 commit 5f15f26
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/soc/intel/skylake/skl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 5f15f26

Please sign in to comment.