Skip to contentSkip to conversation

ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform

PATCH In review Axel Lin 3 participants 3 messages Aug 30, 2015

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform

Signed-off-by Axel Lin <[email protected]>
---
 sound/soc/sh/dma-sh7760.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
sound/soc/sh/dma-sh7760.c +1 -8
index fd11404..8fad444 100644
@@ -327,13 +327,7 @@ static struct snd_soc_platform_driver sh7760_soc_platform = {
 
 static int sh7760_soc_platform_probe(struct platform_device *pdev)
 {
-	return snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform);
-}
-
-static int sh7760_soc_platform_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_platform(&pdev->dev);
-	return 0;
+	return devm_snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform);
 }
 
 static struct platform_driver sh7760_pcm_driver = {

@@ -342,7 +336,6 @@ static struct platform_driver sh7760_pcm_driver = {
 	},
 
 	.probe = sh7760_soc_platform_probe,
-	.remove = sh7760_soc_platform_remove,
 };
 
 module_platform_driver(sh7760_pcm_driver);
Signature · 1 line
2.1.0
Acked-by on v1 1/1
#1 lore raw
Quoted 25 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>
---
 sound/soc/sh/dma-sh7760.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
sound/soc/sh/dma-sh7760.c +1 -7
index fd11404..8fad444 100644
@@ -327,13 +327,7 @@ static struct snd_soc_platform_driver sh7760_soc_platform = {
 
 static int sh7760_soc_platform_probe(struct platform_device *pdev)
 {
-       return snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform);
-}
-
-static int sh7760_soc_platform_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_platform(&pdev->dev);
-       return 0;
+       return devm_snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform);
 }
 
 static struct platform_driver sh7760_pcm_driver = {

sound/soc/sh/dma-sh7760.c static struct platform_driver sh7760_pcm_driver = {

Quoted 8 lines
sound/soc/sh/dma-sh7760.c +0 -2
@@ -342,7 +336,6 @@ static struct platform_driver sh7760_pcm_driver = {
        },
 
        .probe = sh7760_soc_platform_probe,
-       .remove = sh7760_soc_platform_remove,
 };
 
 module_platform_driver(sh7760_pcm_driver);
--

Looking good,

Acked-by Manuel Lauss <[email protected]>
maintainer
#2 lore raw

Applied "ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform" to the asoc tree

In reply to Axel Lin

The patch

ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform

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 e8de871e19668257972b167aabd56bb5faae784c Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
Date: Sun, 30 Aug 2015 11:07:33 +0800
Subject: [PATCH] ASoC: sh: dma-sh7760: Convert to
devm_snd_soc_register_platform

Signed-off-by Axel Lin <[email protected]>
Acked-by Manuel Lauss <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 sound/soc/sh/dma-sh7760.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
sound/soc/sh/dma-sh7760.c +1 -8
index fd11404..8fad444 100644
@@ -327,13 +327,7 @@ static struct snd_soc_platform_driver sh7760_soc_platform = {
 
 static int sh7760_soc_platform_probe(struct platform_device *pdev)
 {
-	return snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform);
-}
-
-static int sh7760_soc_platform_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_platform(&pdev->dev);
-	return 0;
+	return devm_snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform);
 }
 
 static struct platform_driver sh7760_pcm_driver = {

@@ -342,7 +336,6 @@ static struct platform_driver sh7760_pcm_driver = {
 	},
 
 	.probe = sh7760_soc_platform_probe,
-	.remove = sh7760_soc_platform_remove,
 };
 
 module_platform_driver(sh7760_pcm_driver);
Signature · 1 line
2.5.0