| Message ID | 20220705161102.76250-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0d356c186ffd6d4c3e10abb283379d09a93d2515 |
| Headers | show |
| Series | [v2,1/2] ASoC: SOF: Intel: bdw: remove duplicating driver data retrieval | expand |
On 7/5/22 11:11, Andy Shevchenko wrote: > 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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > v2: moved desc assignment closer to its user (Péter) > sound/soc/sof/intel/bdw.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c > index 26df780c702e..a446154f2803 100644 > --- a/sound/soc/sof/intel/bdw.c > +++ b/sound/soc/sof/intel/bdw.c > @@ -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 */
On Tue, 5 Jul 2022 19:11:01 +0300, Andy Shevchenko wrote: > 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
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c index 26df780c702e..a446154f2803 100644 --- a/sound/soc/sof/intel/bdw.c +++ b/sound/soc/sof/intel/bdw.c @@ -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 */
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: moved desc assignment closer to its user (Péter) sound/soc/sof/intel/bdw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)