summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2022-07-05 18:58:13 +0300
committerMark Brown <broonie@kernel.org>2022-07-05 19:53:50 +0100
commitb03bd215742c620812e47a9ef5f08e4e0e5f0a1a (patch)
tree85712d951a016fc9fd442e86c43fd7db1555231c
parentf4ba35b79bd0104f00e8e21e400b980bfaa2f17e (diff)
downloadlinux-stable-b03bd215742c620812e47a9ef5f08e4e0e5f0a1a.tar.gz
linux-stable-b03bd215742c620812e47a9ef5f08e4e0e5f0a1a.tar.bz2
linux-stable-b03bd215742c620812e47a9ef5f08e4e0e5f0a1a.zip
ASoC: Intel: catpt: remove duplicating driver data retrieval
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>
-rw-r--r--sound/soc/intel/catpt/device.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c
index 85a34e37316d..d48a71d2cf1e 100644
--- a/sound/soc/intel/catpt/device.c
+++ b/sound/soc/intel/catpt/device.c
@@ -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 */