Skip to contentSkip to conversation

ASoC: Intel: catpt: remove duplicating driver data retrieval

PATCH Superseded Andy Shevchenko 3 participants 4 messages Jul 3, 2022 – Jul 5, 2022

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
v2: dropped device_get_match_data() and rewrote commit message

 sound/soc/intel/catpt/device.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/intel/catpt/device.c +1 -4
index 85a34e37316d..2eeaeb962532 100644
@@ -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;
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 23 lines · Andy Shevchenko

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.

---
v2: dropped device_get_match_data() and rewrote commit message

 sound/soc/intel/catpt/device.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/intel/catpt/device.c +1 -0
index 85a34e37316d..2eeaeb962532 100644
@@ -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) {

sound/soc/intel/catpt/device.c static int catpt_acpi_probe(struct platform_device *pdev) · line 260

Quoted 10 lines
sound/soc/intel/catpt/device.c +0 -4
@@ -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);

Signature · 1 line
Péter
#2 lore raw
Quoted 1 line · Péter Ujfalusi

On 03/07/2022 17:51, Andy Shevchenko wrote:

...

Quoted 3 lines

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?

I would not go this way for non-POD types.

Quoted 3 lines

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

This I can do (as well as in the other patch).

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#3 lore raw
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Péter Ujfalusi

On 03/07/2022 17:51, Andy Shevchenko wrote:

...

Quoted 5 lines
Quoted 3 lines

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?

I would not go this way for non-POD types.

Agree with Andy here.

Quoted 5 lines
Quoted 3 lines

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

This I can do (as well as in the other patch).

Agree with Peter's suggestion here too.

Thank you both for taking time in improving driver's quality!

Regards,
Czarek