On 04/07/2022 19:19, Andy Shevchenko wrote: > On Mon, Jul 04, 2022 at 10:31:48AM +0300, Péter Ujfalusi wrote: >> On 03/07/2022 17:35, Andy Shevchenko wrote: > > ... > >> + return sof_acpi_probe(pdev, (const struct sof_dev_desc *)id->driver_data); >> } > >> We don't use the desc in sof_broadwell_probe(), so we can just pass the id->driver_data > > I prefer not to cast inside the function parameters when it's not about POD. Fair enough. How about assigning desc before it is used? 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 */ -- Péter
