Commit 2dddc514 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Takashi Iwai
Browse files

ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. 



Now that we can use -EPROBE_DEFER, it's no longer required to spin off
the snd_hdac_i915_init into a workqueue. It's likely the whole workqueue
can be destroyed, but I don't have the means to test this.

Removing the workqueue would simplify init even further, but is left
as exercise for the reviewer.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20231009115437.99976-10-maarten.lankhorst@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e8e3f869

sound/soc/intel/avs/core.c

+9 −4
Original line number Diff line number Diff line
@@ -191,10 +191,6 @@ static void avs_hda_probe_work(struct work_struct *work) 


	pm_runtime_set_active(bus->dev); /* clear runtime_error flag */



	ret = snd_hdac_i915_init(bus, true);

	if (ret < 0)

		dev_info(bus->dev, "i915 init unsuccessful: %d\n", ret);



	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, true);

	avs_hdac_bus_init_chip(bus, true);

	avs_hdac_bus_probe_codecs(bus);
@@ -465,10 +461,19 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) 
	pci_set_drvdata(pci, bus);

	device_disable_async_suspend(dev);



	ret = snd_hdac_i915_init(bus, false);

	if (ret == -EPROBE_DEFER)

		goto err_i915_init;

	else if (ret < 0)

		dev_info(bus->dev, "i915 init unsuccessful: %d\n", ret);



	schedule_work(&adev->probe_work);



	return 0;



err_i915_init:

	pci_clear_master(pci);

	pci_set_drvdata(pci, NULL);

err_acquire_irq:

	snd_hdac_bus_free_stream_pages(bus);

	snd_hdac_ext_stream_free_all(bus);