ASoC: SOF: Intel: bdw: remove duplicating driver data retrieval
Subsystems (3)
PATCH 1/1 ASoC: SOF: Intel: bdw: 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.
--- sound/soc/sof/intel/bdw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
sound/soc/sof/intel/bdw.c +2 -5
@@ -674,6 +674,7 @@ static int sof_broadwell_probe(struct platform_device *pdev) id =acpi_match_device (dev->driver->acpi_match_table, dev);if (!id)return -ENODEV ; + desc = (const struct sof_dev_desc *)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_SOF ) {
@@ -681,11 +682,7 @@ static int sof_broadwell_probe(struct platform_device *pdev)return -ENODEV ; } - desc =device_get_match_data (dev); -if (!desc) -return -ENODEV ; - -return sof_acpi_probe (pdev,device_get_match_data (dev)); +return sof_acpi_probe (pdev, desc); }/* acpi_driver definition */
Signature · 1 line
2.35.1
Péter Ujfalusi
maintainerQuoted 22 lines · Andy Shevchenko
device_get_match_data()in ACPI case calls similar toacpi_match_device(). Hence there is no need to duplicate the call. Just assign what is in theid->driver_data.Signed-off-by Andy Shevchenko <[email protected]>--- sound/soc/sof/intel/bdw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)sound/soc/sof/intel/bdw.c +1
-0@@ -674,6 +674,7 @@ static int sof_broadwell_probe(struct platform_device *pdev) id =acpi_match_device (dev->driver->acpi_match_table, dev);if (!id)return -ENODEV ; + desc = (const struct sof_dev_desc *)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_SOF ) {
sound/soc/sof/intel/bdw.c static int sof_broadwell_probe(struct platform_device *pdev) · line 686
Quoted 10 lines
sound/soc/sof/intel/bdw.c +1
-5@@ -681,11 +682,7 @@ static int sof_broadwell_probe(struct platform_device *pdev)return -ENODEV ; } - desc =device_get_match_data (dev); -if (!desc) -return -ENODEV ; - -return sof_acpi_probe (pdev,device_get_match_data (dev)); +return sof_acpi_probe (pdev, desc); }
Would it not be simpler to just:
sound/soc/sof/intel/bdw.c +1 -6
@@ -668,7 +668,6 @@ static int sof_broadwell_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;const struct acpi_device_id *id; -const struct sof_dev_desc *desc;int ret; id =acpi_match_device (dev->driver->acpi_match_table, dev);
@@ -681,11 +680,7 @@ static int sof_broadwell_probe(struct platform_device *pdev)return -ENODEV ; } - desc =device_get_match_data (dev); -if (!desc) -return -ENODEV ; - -return sof_acpi_probe (pdev,device_get_match_data (dev)); +return sof_acpi_probe (pdev, (const struct sof_dev_desc *)id->driver_data); }/* acpi_driver definition */
---
We don't use the desc in sof_broadwell_probe(), so we can just pass the id->driver_data
Signature · 1 line
Péter
Quoted 1 line · Péter Ujfalusi
On 03/07/2022 17:35, Andy Shevchenko wrote:
...
Quoted 4 lines
sound/soc/sof/intel/bdw.c +1
-0+return sof_acpi_probe (pdev, (const struct sof_dev_desc *)id->driver_data); }We don't use the desc in
sof_broadwell_probe(), so we can just pass theid->driver_data
I prefer not to cast inside the function parameters when it's not about POD.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Péter Ujfalusi
maintainerQuoted 11 lines · Andy Shevchenko
Quoted 1 line · Péter Ujfalusi
On 03/07/2022 17:35, Andy Shevchenko wrote:
...
Quoted 4 lines
(quoted diff) +1
-0+ return sof_acpi_probe(pdev, (const struct sof_dev_desc *)id->driver_data); }We don't use the desc in
sof_broadwell_probe(), so we can just pass theid->driver_dataI prefer not to cast inside the function parameters when it's not about POD.
Fair enough.
How about assigning desc before it is used?
sound/soc/sof/intel/bdw.c +2 -5
@@ -681,11 +681,8 @@ static int sof_broadwell_probe(struct platform_device *pdev)return -ENODEV ; } - desc =device_get_match_data (dev); -if (!desc) -return -ENODEV ; - -return sof_acpi_probe (pdev,device_get_match_data (dev)); + desc = (const struct sof_dev_desc *)id->driver_data; +return sof_acpi_probe (pdev, desc); }/* acpi_driver definition */
Signature · 1 line
Péter
Quoted 3 lines · Péter Ujfalusi
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Péter Ujfalusi
On 03/07/2022 17:35, Andy Shevchenko wrote:
...
Quoted 10 lines
Quoted 6 lines
Quoted 4 lines
+ return
sof_acpi_probe(pdev, (const struct sof_dev_desc *)id->driver_data);
}We don't use the desc in
sof_broadwell_probe(), so we can just pass theid->driver_dataI prefer not to cast inside the function parameters when it's not about POD.
Fair enough.
How about assigning desc before it is used?
As answered in the other email, I'm fine to modify the change accordingly.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 22 lines · Andy Shevchenko
device_get_match_data()in ACPI case calls similar toacpi_match_device(). Hence there is no need to duplicate the call. Just assign what is in theid->driver_data.Signed-off-by Andy Shevchenko <[email protected]>--- sound/soc/sof/intel/bdw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)sound/soc/sof/intel/bdw.c +1
-0@@ -674,6 +674,7 @@ static int sof_broadwell_probe(struct platform_device *pdev) id =acpi_match_device (dev->driver->acpi_match_table, dev);if (!id)return -ENODEV ; + desc = (const struct sof_dev_desc *)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_SOF ) {
sound/soc/sof/intel/bdw.c static int sof_broadwell_probe(struct platform_device *pdev) · line 685
Quoted 9 lines
sound/soc/sof/intel/bdw.c +1
-5@@ -681,11 +682,7 @@ static int sof_broadwell_probe(struct platform_device *pdev)return -ENODEV ; } - desc =device_get_match_data (dev); -if (!desc) -return -ENODEV ; - -return sof_acpi_probe (pdev,device_get_match_data (dev)); +return sof_acpi_probe (pdev, desc);
Thanks Andy, we have the same code pattern in sound/soc/sof/intel/byt.c, can we change it as part of the series to keep the two files aligned?
Quoted 3 lines
sound/soc/sof/intel/bdw.c +0
-0}/* acpi_driver definition */
Quoted 1 line · Pierre-Louis Bossart
On 7/3/22 09:35, Andy Shevchenko wrote:
...
Quoted 2 lines
Thanks Andy, we have the same code pattern in
sound/soc/sof/intel/byt.c, can we change it as part of the series to keep the two files aligned?
Sure. I was looking for the ID of WPT SPI (I2S) controller and that's how I found these two.
Signature · 2 lines
With Best Regards, Andy Shevchenko