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 <[email protected]>
---
v3: moved spec assignment closer to its user (Péter, Czarek)
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..d48a71d2cf1e 100644
--- a/sound/soc/intel/catpt/device.c
+++ b/sound/soc/intel/catpt/device.c
@@ -254,14 +254,11 @@ 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;
+ spec = (const struct catpt_spec *)id->driver_data;
catpt_dev_init(cdev, dev, spec);
/* map DSP bar address */
--
2.35.1
On 2022-07-05 5:58 PM, 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.
Thanks for the patch! Change looks good:
Acked-by: Cezary Rojewski <[email protected]>
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---
> v3: moved spec assignment closer to its user (Péter, Czarek)
> 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..d48a71d2cf1e 100644
> --- a/sound/soc/intel/catpt/device.c
> +++ b/sound/soc/intel/catpt/device.c
> @@ -254,14 +254,11 @@ 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;
>
> + spec = (const struct catpt_spec *)id->driver_data;
> catpt_dev_init(cdev, dev, spec);
>
> /* map DSP bar address */
On Tue, 5 Jul 2022 18:58:13 +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/1] ASoC: Intel: catpt: remove duplicating driver data retrieval
commit: b03bd215742c620812e47a9ef5f08e4e0e5f0a1a
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