]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: Intel: catpt: remove duplicating driver data retrieval
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 5 Jul 2022 15:58:13 +0000 (18:58 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 5 Jul 2022 18:53:50 +0000 (19:53 +0100)
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: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220705155813.75917-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/catpt/device.c

index 85a34e37316d0aa9467aee95146b4894d943bc78..d48a71d2cf1ecaeb043d8224794c631ebec01ee3 100644 (file)
@@ -254,14 +254,11 @@ 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;
 
+       spec = (const struct catpt_spec *)id->driver_data;
        catpt_dev_init(cdev, dev, spec);
 
        /* map DSP bar address */