Skip to contentSkip to conversation

ASoC: SOF: Intel: bdw: remove duplicating driver data retrieval

PATCH In review Andy Shevchenko 3 participants 5 messages Jul 5, 2022 – Jul 6, 2022

Subsystems (3)

v2 of 3 In review Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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

---
v2: moved desc assignment closer to its user (Péter)

 sound/soc/sof/intel/bdw.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
sound/soc/sof/intel/bdw.c +2 -5
index 26df780c702e..a446154f2803 100644
@@ -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
2.35.1
#1 lore raw

PATCH v2 2/2 ASoC: SOF: Intel: byt: 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: new patch (Pierre)

 sound/soc/sof/intel/byt.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/sof/intel/byt.c +1 -4
index 4ed8381eceda..e6dc4ff531c3 100644
@@ -465,10 +465,7 @@ static int sof_baytrail_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	desc = device_get_match_data(&pdev->dev);
-	if (!desc)
-		return -ENODEV;
-
+	desc = (const struct sof_dev_desc *)id->driver_data;
 	if (desc == &sof_acpi_baytrail_desc && soc_intel_is_byt_cr(pdev))
 		desc = &sof_acpi_baytrailcr_desc;
 
Signature · 1 line
2.35.1
Acked-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] ASoC: SOF: Intel: byt: remove duplicating driver data retrieval

Quoted 5 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.

Thanks Andy!

Quoted 21 lines

---
v2: new patch (Pierre)

 sound/soc/sof/intel/byt.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/sof/intel/byt.c +1 -4
index 4ed8381eceda..e6dc4ff531c3 100644
@@ -465,10 +465,7 @@ static int sof_baytrail_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	desc = device_get_match_data(&pdev->dev);
-	if (!desc)
-		return -ENODEV;
-
+	desc = (const struct sof_dev_desc *)id->driver_data;
 	if (desc == &sof_acpi_baytrail_desc && soc_intel_is_byt_cr(pdev))
 		desc = &sof_acpi_baytrailcr_desc;
 
Acked-by on v2 1/2
#3 lore raw
In reply to Andy Shevchenko
Quoted 5 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.

Quoted 23 lines

---
v2: moved desc assignment closer to its user (Péter)

 sound/soc/sof/intel/bdw.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
sound/soc/sof/intel/bdw.c +2 -5
index 26df780c702e..a446154f2803 100644
@@ -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 */
maintainer
#4 lore raw
In reply to Andy Shevchenko
Quoted 5 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.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: SOF: Intel: bdw: remove duplicating driver data retrieval

      commit: 0d356c186ffd6d4c3e10abb283379d09a93d2515
[2/2] ASoC: SOF: Intel: byt: remove duplicating driver data retrieval
      commit: 65b6851d243ff54cbd4adfb887a8af9d04b7f286

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark