ASoC: SOF: Check desc->ops directly in acpi/pci/of probe functions

We can check for the desc->ops directly in the probe functions, the ops
is not used directly in the functions.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210521092804.3721324-2-kai.vehmanen@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 7fbf09f..74982c0 100644 (file)
--- a/sound/soc/sof/sof-acpi-dev.c
+++ b/sound/soc/sof/sof-acpi-dev.c
@@ -60,7 +60,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;
 
        dev_dbg(dev, "ACPI DSP detected");
 
@@ -68,9 +67,7 @@ int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc
        if (!sof_pdata)
                return -ENOMEM;
 
-       /* get ops for platform */
-       ops = desc->ops;
-       if (!ops) {
+       if (!desc->ops) {
                dev_err(dev, "error: no matching ACPI descriptor ops\n");
                return -ENODEV;
        }

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c
index c9c7064..d1a21ed 100644 (file)
--- a/sound/soc/sof/sof-of-dev.c
+++ b/sound/soc/sof/sof-of-dev.c
@@ -70,7 +70,6 @@ static int sof_of_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        const struct sof_dev_desc *desc;
        struct snd_sof_pdata *sof_pdata;
-       const struct snd_sof_dsp_ops *ops;
 
        dev_info(&pdev->dev, "DT DSP detected");
 
@@ -82,9 +81,7 @@ static int sof_of_probe(struct platform_device *pdev)
        if (!desc)
                return -ENODEV;
 
-       /* get ops for platform */
-       ops = desc->ops;
-       if (!ops) {
+       if (!desc->ops) {
                dev_err(dev, "error: no matching DT descriptor ops\n");
                return -ENODEV;
        }

diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 3489dc1..a1db973 100644 (file)
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -116,14 +116,11 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
        const struct sof_dev_desc *desc =
                (const struct sof_dev_desc *)pci_id->driver_data;
        struct snd_sof_pdata *sof_pdata;
-       const struct snd_sof_dsp_ops *ops;
        int ret;
 
        dev_dbg(&pci->dev, "PCI DSP detected");
 
-       /* get ops for platform */
-       ops = desc->ops;
-       if (!ops) {
+       if (!desc->ops) {
                dev_err(dev, "error: no matching PCI descriptor ops\n");
                return -ENODEV;
        }