On 03/07/2022 17:35, 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@xxxxxxxxxxxxxxx>
> ---
> 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..346813aa3768 100644
> --- a/sound/soc/sof/intel/bdw.c
> +++ b/sound/soc/sof/intel/bdw.c
> @@ -674,6 +674,7 @@ static int sof_broadwell_probe(struct platform_device *pdev)
> id = acpi_match_device(dev->driver->acpi_match_table, dev);
> if (!id)
> return -ENODEV;
> + desc = (const struct sof_dev_desc *)id->driver_data;
>
> ret = snd_intel_acpi_dsp_driver_probe(dev, id->id);
> if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) {
> @@ -681,11 +682,7 @@ 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));
> + return sof_acpi_probe(pdev, desc);
> }
Would it not be simpler to just:
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index 26df780c702e..2ee22c2772ba 100644
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -668,7 +668,6 @@ static int sof_broadwell_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
const struct acpi_device_id *id;
- const struct sof_dev_desc *desc;
int ret;
id = acpi_match_device(dev->driver->acpi_match_table, dev);
@@ -681,11 +680,7 @@ 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));
+ return sof_acpi_probe(pdev, (const struct sof_dev_desc *)id->driver_data);
}
/* acpi_driver definition */
---
We don't use the desc in sof_broadwell_probe(), so we can just pass the id->driver_data
--
Péter
