ASoC: davinci-vcif: Use devm_snd_soc_register_component
PATCH 1/1 ASoC: davinci-vcif: Use devm_snd_soc_register_component
Use resource managed function devm_snd_soc_register_component for component registration instead of snd_soc_register_component.
Also, remove davinci_vcif_remove as it is now redundant.
--- sound/soc/davinci/davinci-vcif.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
sound/soc/davinci/davinci-vcif.c +3 -11
@@ -231,8 +231,9 @@ static int davinci_vcif_probe(struct platform_device *pdev)dev_set_drvdata (&pdev->dev, davinci_vcif_dev); - ret =snd_soc_register_component (&pdev->dev, &davinci_vcif_component, - &davinci_vcif_dai,1 ); + ret =devm_snd_soc_register_component (&pdev->dev, + &davinci_vcif_component, + &davinci_vcif_dai,1 );if (ret !=0 ) {dev_err (&pdev->dev,"could not register dai\n" );return ret;
@@ -241,23 +242,14 @@ static int davinci_vcif_probe(struct platform_device *pdev) ret =edma_pcm_platform_register (&pdev->dev);if (ret) {dev_err (&pdev->dev,"register PCM failed: %d\n" , ret); -snd_soc_unregister_component (&pdev->dev);return ret; }return 0 ; } -static int davinci_vcif_remove (struct platform_device *pdev) -{ -snd_soc_unregister_component (&pdev->dev); - -return 0 ; -} -static struct platform_driver davinci_vcif_driver = { .probe = davinci_vcif_probe, - .remove = davinci_vcif_remove, .driver = { .name ="davinci-vcif" , },
Signature · 1 line
1.9.1
Quoted 4 lines · Vaishali Thakkar
Use resource managed function
devm_snd_soc_register_componentfor component registration instead ofsnd_soc_register_component.Also, remove
davinci_vcif_removeas it is now redundant.
Quoted 46 lines
Signed-off-by Vaishali Thakkar <[email protected]>--- sound/soc/davinci/davinci-vcif.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)sound/soc/davinci/davinci-vcif.c +3
-11@@ -231,8 +231,9 @@ static int davinci_vcif_probe(struct platform_device *pdev)dev_set_drvdata (&pdev->dev, davinci_vcif_dev); - ret =snd_soc_register_component (&pdev->dev, &davinci_vcif_component, - &davinci_vcif_dai,1 ); + ret =devm_snd_soc_register_component (&pdev->dev, + &davinci_vcif_component, + &davinci_vcif_dai,1 );if (ret !=0 ) {dev_err (&pdev->dev,"could not register dai\n" );return ret;@@ -241,23 +242,14 @@ static int davinci_vcif_probe(struct platform_device *pdev) ret =edma_pcm_platform_register (&pdev->dev);if (ret) {dev_err (&pdev->dev,"register PCM failed: %d\n" , ret); -snd_soc_unregister_component (&pdev->dev);return ret; }return 0 ; } -static int davinci_vcif_remove (struct platform_device *pdev) -{ -snd_soc_unregister_component (&pdev->dev); - -return 0 ; -} -static struct platform_driver davinci_vcif_driver = { .probe = davinci_vcif_probe, - .remove = davinci_vcif_remove, .driver = { .name ="davinci-vcif" , },
Signature · 1 line
Péter
Mark Brown
maintainerApplied "ASoC: davinci-vcif: Use devm_snd_soc_register_component" to the asoc tree
In reply to Vaishali ThakkarThe patch
ASoC: davinci-vcif: Use devm_snd_soc_register_component
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
553de19a0e2f21809bc3864d40308864652521ebMon Sep 17 00:00:00 2001
From: Vaishali Thakkar <[email protected]>
Date: Sat, 15 Aug 2015 08:01:55 +0530
Subject: [PATCH] ASoC: davinci-vcif: Use devm_snd_soc_register_component
Use resource managed function devm_snd_soc_register_component for component registration instead of snd_soc_register_component.
Also, remove davinci_vcif_remove as it is now redundant.
--- sound/soc/davinci/davinci-vcif.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
sound/soc/davinci/davinci-vcif.c +3 -11
@@ -231,8 +231,9 @@ static int davinci_vcif_probe(struct platform_device *pdev)dev_set_drvdata (&pdev->dev, davinci_vcif_dev); - ret =snd_soc_register_component (&pdev->dev, &davinci_vcif_component, - &davinci_vcif_dai,1 ); + ret =devm_snd_soc_register_component (&pdev->dev, + &davinci_vcif_component, + &davinci_vcif_dai,1 );if (ret !=0 ) {dev_err (&pdev->dev,"could not register dai\n" );return ret;
@@ -241,23 +242,14 @@ static int davinci_vcif_probe(struct platform_device *pdev) ret =edma_pcm_platform_register (&pdev->dev);if (ret) {dev_err (&pdev->dev,"register PCM failed: %d\n" , ret); -snd_soc_unregister_component (&pdev->dev);return ret; }return 0 ; } -static int davinci_vcif_remove (struct platform_device *pdev) -{ -snd_soc_unregister_component (&pdev->dev); - -return 0 ; -} -static struct platform_driver davinci_vcif_driver = { .probe = davinci_vcif_probe, - .remove = davinci_vcif_remove, .driver = { .name ="davinci-vcif" , },
Signature · 1 line
2.5.0