Browse Source

ASoC: blackfin: Convert to devm_snd_soc_register_platform

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Axel Lin 10 years ago
parent
commit
c4d2ab0d59
2 changed files with 4 additions and 16 deletions
  1. 2 8
      sound/soc/blackfin/bf5xx-ac97-pcm.c
  2. 2 8
      sound/soc/blackfin/bf5xx-i2s-pcm.c

+ 2 - 8
sound/soc/blackfin/bf5xx-ac97-pcm.c

@@ -450,13 +450,8 @@ static struct snd_soc_platform_driver bf5xx_ac97_soc_platform = {
 
 
 static int bf5xx_soc_platform_probe(struct platform_device *pdev)
 static int bf5xx_soc_platform_probe(struct platform_device *pdev)
 {
 {
-	return snd_soc_register_platform(&pdev->dev, &bf5xx_ac97_soc_platform);
-}
-
-static int bf5xx_soc_platform_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_platform(&pdev->dev);
-	return 0;
+	return devm_snd_soc_register_platform(&pdev->dev,
+					      &bf5xx_ac97_soc_platform);
 }
 }
 
 
 static struct platform_driver bf5xx_pcm_driver = {
 static struct platform_driver bf5xx_pcm_driver = {
@@ -465,7 +460,6 @@ static struct platform_driver bf5xx_pcm_driver = {
 	},
 	},
 
 
 	.probe = bf5xx_soc_platform_probe,
 	.probe = bf5xx_soc_platform_probe,
-	.remove = bf5xx_soc_platform_remove,
 };
 };
 
 
 module_platform_driver(bf5xx_pcm_driver);
 module_platform_driver(bf5xx_pcm_driver);

+ 2 - 8
sound/soc/blackfin/bf5xx-i2s-pcm.c

@@ -342,13 +342,8 @@ static struct snd_soc_platform_driver bf5xx_i2s_soc_platform = {
 
 
 static int bfin_i2s_soc_platform_probe(struct platform_device *pdev)
 static int bfin_i2s_soc_platform_probe(struct platform_device *pdev)
 {
 {
-	return snd_soc_register_platform(&pdev->dev, &bf5xx_i2s_soc_platform);
-}
-
-static int bfin_i2s_soc_platform_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_platform(&pdev->dev);
-	return 0;
+	return devm_snd_soc_register_platform(&pdev->dev,
+					      &bf5xx_i2s_soc_platform);
 }
 }
 
 
 static struct platform_driver bfin_i2s_pcm_driver = {
 static struct platform_driver bfin_i2s_pcm_driver = {
@@ -357,7 +352,6 @@ static struct platform_driver bfin_i2s_pcm_driver = {
 	},
 	},
 
 
 	.probe = bfin_i2s_soc_platform_probe,
 	.probe = bfin_i2s_soc_platform_probe,
-	.remove = bfin_i2s_soc_platform_remove,
 };
 };
 
 
 module_platform_driver(bfin_i2s_pcm_driver);
 module_platform_driver(bfin_i2s_pcm_driver);