ASoC: SOF: Simplify sof_probe_complete handling for acpi/pci/of

Set the sof_data->sof_probe_complete callback unconditionally of
CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE.

The sof_probe_complete will be called when the sof_probe_continue()
function is successfully executed, called either directly from
snd_sof_device_probe() or from the scheduled work.

Since all error cases within the call chain of snd_sof_device_probe() have
error prints, there is no need to print again in the acpi/pci/of level.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210409220959.1543456-3-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c
index 1fec0420f66251d44894ff8e11df486270b795ed..7fbf09f9f17ea4030e57303de8d3d2a46673e2d3 100644 (file)
--- a/sound/soc/sof/sof-acpi-dev.c
+++ b/sound/soc/sof/sof-acpi-dev.c
@@ -61,7 +61,6 @@ int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc
        struct device *dev = &pdev->dev;
        struct snd_sof_pdata *sof_pdata;
        const struct snd_sof_dsp_ops *ops;
-       int ret;
 
        dev_dbg(dev, "ACPI DSP detected");
 
@@ -93,22 +92,11 @@ int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc
                sof_pdata->tplg_filename_prefix =
                        sof_pdata->desc->default_tplg_path;
 
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)
-       /* set callback to enable runtime_pm */
+       /* set callback to be called on successful device probe to enable runtime_pm */
        sof_pdata->sof_probe_complete = sof_acpi_probe_complete;
-#endif
-       /* call sof helper for DSP hardware probe */
-       ret = snd_sof_device_probe(dev, sof_pdata);
-       if (ret) {
-               dev_err(dev, "error: failed to probe DSP hardware!\n");
-               return ret;
-       }
 
-#if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)
-       sof_acpi_probe_complete(dev);
-#endif
-
-       return ret;
+       /* call sof helper for DSP hardware probe */
+       return snd_sof_device_probe(dev, sof_pdata);
 }
 EXPORT_SYMBOL_NS(sof_acpi_probe, SND_SOC_SOF_ACPI_DEV);
 

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c
index 85ff0db88eb7ab8e327712a786292b49d4d98810..c9c70645b37774892ddd237c1dc8fc55168be056 100644 (file)
--- a/sound/soc/sof/sof-of-dev.c
+++ b/sound/soc/sof/sof-of-dev.c
@@ -71,7 +71,6 @@ static int sof_of_probe(struct platform_device *pdev)
        const struct sof_dev_desc *desc;
        struct snd_sof_pdata *sof_pdata;
        const struct snd_sof_dsp_ops *ops;
-       int ret;
 
        dev_info(&pdev->dev, "DT DSP detected");
 
@@ -98,22 +97,11 @@ static int sof_of_probe(struct platform_device *pdev)
        sof_pdata->fw_filename_prefix = sof_pdata->desc->default_fw_path;
        sof_pdata->tplg_filename_prefix = sof_pdata->desc->default_tplg_path;
 
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)
-       /* set callback to enable runtime_pm */
+       /* set callback to be called on successful device probe to enable runtime_pm */
        sof_pdata->sof_probe_complete = sof_of_probe_complete;
-#endif
-        /* call sof helper for DSP hardware probe */
-       ret = snd_sof_device_probe(dev, sof_pdata);
-       if (ret) {
-               dev_err(dev, "error: failed to probe DSP hardware\n");
-               return ret;
-       }
-
-#if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)
-       sof_of_probe_complete(dev);
-#endif
 
-       return ret;
+       /* call sof helper for DSP hardware probe */
+       return snd_sof_device_probe(dev, sof_pdata);
 }
 
 static int sof_of_remove(struct platform_device *pdev)

diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index b842a414e1df2e680754076103084b3474ce1f1e..3489dc1b48f614e61f253abce3f320e7a9df27f9 100644 (file)
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -184,25 +184,13 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
        if (sof_override_tplg_name)
                sof_pdata->tplg_filename = sof_override_tplg_name;
 
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)
-       /* set callback to enable runtime_pm */
+       /* set callback to be called on successful device probe to enable runtime_pm */
        sof_pdata->sof_probe_complete = sof_pci_probe_complete;
-#endif
+
        /* call sof helper for DSP hardware probe */
        ret = snd_sof_device_probe(dev, sof_pdata);
-       if (ret) {
-               dev_err(dev, "error: failed to probe DSP hardware!\n");
-               goto release_regions;
-       }
-
-#if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)
-       sof_pci_probe_complete(dev);
-#endif
-
-       return ret;
-
-release_regions:
-       pci_release_regions(pci);
+       if (ret)
+               pci_release_regions(pci);
 
        return ret;
 }