All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 1/1] ASoC: Intel: catpt: remove duplicating driver data retrieval
@ 2022-07-03 14:51 ` Andy Shevchenko
  0 siblings, 0 replies; 8+ messages in thread
From: Andy Shevchenko @ 2022-07-03 14:51 UTC (permalink / raw)
  To: Andy Shevchenko, alsa-devel, linux-kernel
  Cc: Cezary Rojewski, Kai Vehmanen, Peter Ujfalusi, Takashi Iwai,
	Pierre-Louis Bossart, Ranjani Sridharan, Liam Girdwood,
	Mark Brown, Bard Liao

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;
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-07-05 13:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-03 14:51 [PATCH v2 1/1] ASoC: Intel: catpt: remove duplicating driver data retrieval Andy Shevchenko
2022-07-03 14:51 ` Andy Shevchenko
2022-07-04  7:36 ` Péter Ujfalusi
2022-07-04  7:36   ` Péter Ujfalusi
2022-07-04 16:20   ` Andy Shevchenko
2022-07-04 16:20     ` Andy Shevchenko
2022-07-05 12:42     ` Cezary Rojewski
2022-07-05 12:42       ` Cezary Rojewski

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.