Re: [PATCH v3 5/9] ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work.

[Pierre-Louis Bossart]

On 8/7/23 04:00, Maarten Lankhorst wrote:
> 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.
> 
> Changes since v1:
> - Rename error label.

same issue with changes, they need to be ...
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> Acked-by: Mark Brown <broonie@xxxxxxxxxx>
> Reviewed-by: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx>> ---

...here

>  sound/soc/intel/avs/core.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
> index 3311a6f14200..64e7a4e650a8 100644
> --- a/sound/soc/intel/avs/core.c
> +++ b/sound/soc/intel/avs/core.c
> @@ -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);