Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/intel/skylake/skl.c

+18 −22
Original line number Diff line number Diff line
@@ -826,13 +826,11 @@ 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;

	}

	}



	/*

	 * we are done probing so decrement link counts
@@ -1034,8 +1032,6 @@ 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)
@@ -1052,7 +1048,7 @@ static int skl_probe(struct pci_dev *pci, 
	}

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