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>

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);