device_get_match_data() in ACPI case calls similar to acpi_match_device(). Hence there is no need to duplicate the call. Just assign what is in the id->driver_data.

Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- v2: new patch (Pierre) sound/soc/sof/intel/byt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c index 4ed8381eceda..e6dc4ff531c3 100644 --- a/sound/soc/sof/intel/byt.c +++ b/sound/soc/sof/intel/byt.c @@ -465,10 +465,7 @@ static int sof_baytrail_probe(struct platform_device *pdev) return -ENODEV; }

- desc = device_get_match_data(&pdev->dev); - if (!desc) - return -ENODEV; - + desc = (const struct sof_dev_desc *)id->driver_data; if (desc == &sof_acpi_baytrail_desc && soc_intel_is_byt_cr(pdev)) desc = &sof_acpi_baytrailcr_desc;

On 7/5/22 11:11, Andy Shevchenko wrote:

device_get_match_data() in ACPI case calls similar to acpi_match_device(). Hence there is no need to duplicate the call. Just assign what is in the id->driver_data.

Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com

Acked-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com

---

v2: moved desc assignment closer to its user (Péter) sound/soc/sof/intel/bdw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c index 26df780c702e..a446154f2803 100644 --- a/sound/soc/sof/intel/bdw.c +++ b/sound/soc/sof/intel/bdw.c @@ -681,11 +681,8 @@ static int sof_broadwell_probe(struct platform_device *pdev) return -ENODEV; }

• desc = device_get_match_data(dev);
• if (!desc)

• return -ENODEV;
  

• return sof_acpi_probe(pdev, device_get_match_data(dev));

• desc = (const struct sof_dev_desc *)id->driver_data;
• return sof_acpi_probe(pdev, desc);

}

/* acpi_driver definition */