On 03/07/2022 17:51, 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

v2: dropped device_get_match_data() and rewrote commit message sound/soc/intel/catpt/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c index 85a34e37316d..2eeaeb962532 100644 --- a/sound/soc/intel/catpt/device.c +++ b/sound/soc/intel/catpt/device.c @@ -247,6 +247,7 @@ static int catpt_acpi_probe(struct platform_device *pdev) id = acpi_match_device(dev->driver->acpi_match_table, dev); if (!id) return -ENODEV;

• spec = (const struct catpt_spec *)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_SST) {

@@ -254,10 +255,6 @@ static int catpt_acpi_probe(struct platform_device *pdev) return -ENODEV; }

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

• return -ENODEV;
  

• cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL); if (!cdev) return -ENOMEM;

We could just pass the "(const struct catpt_spec *)id->driver_data" in place of spec to catpt_dev_init() and we can get rid of the local temporary pointer?

If not, then I would cast out the spec before it's use: spec = (const struct catpt_spec *)id->driver_data; catpt_dev_init(cdev, dev, spec);