summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2018-12-07 17:50:06 -0600
committerMark Brown <broonie@kernel.org>2018-12-13 15:36:04 +0000
commit7f981bdcf55fda28a9a70c9e8151dd200771a0a8 (patch)
tree54945193614745940f34587f82af6b395468dcfa /sound/soc
parentfa11ab5688f744bc868356f3f14c3bb9f283a780 (diff)
downloadlinux-7f981bdcf55fda28a9a70c9e8151dd200771a0a8.tar.gz
linux-7f981bdcf55fda28a9a70c9e8151dd200771a0a8.tar.bz2
linux-7f981bdcf55fda28a9a70c9e8151dd200771a0a8.zip
ASoC: Intel: Skylake: remove useless tests on HDaudio capabilities
bus->ppcap is now tested upfront, there is no need to re-check if the hardware is exposed as needed. Remove tests and remove indentation. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/intel/skylake/skl.c40
1 files changed, 18 insertions, 22 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 72e366bbba33..f04e9ec4432b 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -826,12 +826,10 @@ static void skl_probe_work(struct work_struct *work)
return;
}
- if (bus->ppcap) {
- err = skl_machine_device_register(skl);
- if (err < 0) {
- dev_err(bus->dev, "machine register failed: %d\n", err);
- goto out_err;
- }
+ err = skl_machine_device_register(skl);
+ if (err < 0) {
+ dev_err(bus->dev, "machine register failed: %d\n", err);
+ goto out_err;
}
/*
@@ -1034,25 +1032,23 @@ static int skl_probe(struct pci_dev *pci,
pci_set_drvdata(skl->pci, bus);
- /* check if dsp is there */
- if (bus->ppcap) {
- /* create device for dsp clk */
- err = skl_clock_device_register(skl);
- if (err < 0)
- goto out_clk_free;
+ /* create device for dsp clk */
+ err = skl_clock_device_register(skl);
+ if (err < 0)
+ goto out_clk_free;
- err = skl_find_machine(skl, (void *)pci_id->driver_data);
- if (err < 0)
- goto out_nhlt_free;
+ err = skl_find_machine(skl, (void *)pci_id->driver_data);
+ if (err < 0)
+ goto out_nhlt_free;
- err = skl_init_dsp(skl);
- if (err < 0) {
- dev_dbg(bus->dev, "error failed to register dsp\n");
- goto out_nhlt_free;
- }
- skl->skl_sst->enable_miscbdcge = skl_enable_miscbdcge;
- skl->skl_sst->clock_power_gating = skl_clock_power_gating;
+ err = skl_init_dsp(skl);
+ if (err < 0) {
+ dev_dbg(bus->dev, "error failed to register dsp\n");
+ goto out_nhlt_free;
}
+ skl->skl_sst->enable_miscbdcge = skl_enable_miscbdcge;
+ skl->skl_sst->clock_power_gating = skl_clock_power_gating;
+
if (bus->mlcap)
snd_hdac_ext_bus_get_ml_capabilities(bus);