Commit 7f981bdc authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fa11ab56
...@@ -826,12 +826,10 @@ static void skl_probe_work(struct work_struct *work) ...@@ -826,12 +826,10 @@ static void skl_probe_work(struct work_struct *work)
return; return;
} }
if (bus->ppcap) { err = skl_machine_device_register(skl);
err = skl_machine_device_register(skl); if (err < 0) {
if (err < 0) { dev_err(bus->dev, "machine register failed: %d\n", err);
dev_err(bus->dev, "machine register failed: %d\n", err); goto out_err;
goto out_err;
}
} }
/* /*
...@@ -1034,25 +1032,23 @@ static int skl_probe(struct pci_dev *pci, ...@@ -1034,25 +1032,23 @@ static int skl_probe(struct pci_dev *pci,
pci_set_drvdata(skl->pci, bus); pci_set_drvdata(skl->pci, bus);
/* check if dsp is there */ /* create device for dsp clk */
if (bus->ppcap) { err = skl_clock_device_register(skl);
/* create device for dsp clk */ if (err < 0)
err = skl_clock_device_register(skl); goto out_clk_free;
if (err < 0)
goto out_clk_free;
err = skl_find_machine(skl, (void *)pci_id->driver_data); err = skl_find_machine(skl, (void *)pci_id->driver_data);
if (err < 0) if (err < 0)
goto out_nhlt_free; goto out_nhlt_free;
err = skl_init_dsp(skl); err = skl_init_dsp(skl);
if (err < 0) { if (err < 0) {
dev_dbg(bus->dev, "error failed to register dsp\n"); dev_dbg(bus->dev, "error failed to register dsp\n");
goto out_nhlt_free; goto out_nhlt_free;
}
skl->skl_sst->enable_miscbdcge = skl_enable_miscbdcge;
skl->skl_sst->clock_power_gating = skl_clock_power_gating;
} }
skl->skl_sst->enable_miscbdcge = skl_enable_miscbdcge;
skl->skl_sst->clock_power_gating = skl_clock_power_gating;
if (bus->mlcap) if (bus->mlcap)
snd_hdac_ext_bus_get_ml_capabilities(bus); snd_hdac_ext_bus_get_ml_capabilities(bus);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment