[3/3] ASoC: sh: ssi: Convert to devm_snd_soc_register_component

Commit Message

Axel Lin Aug. 28, 2015, 2:50 a.m. UTC

Signed-off-by: Axel Lin <[e-mail]>
---
 sound/soc/sh/ssi.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

Comments

Manuel Lauss Aug. 30, 2015, 6:24 a.m. UTC | #1

On Fri, Aug 28, 2015 at 4:50 AM, Axel Lin <[e-mail]> wrote:
> Signed-off-by: Axel Lin <[e-mail]>
> ---
>  sound/soc/sh/ssi.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)

Acked-by: Manuel Lauss <[e-mail]>

Patch

diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index ab13146..89ed1b1 100644
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -385,14 +385,9 @@  static const struct snd_soc_component_driver sh4_ssi_component = {
 
 static int sh4_soc_dai_probe(struct platform_device *pdev)
 {
-	return snd_soc_register_component(&pdev->dev, &sh4_ssi_component,
-					  sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai));
-}
-
-static int sh4_soc_dai_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_component(&pdev->dev);
-	return 0;
+	return devm_snd_soc_register_component(&pdev->dev, &sh4_ssi_component,
+					       sh4_ssi_dai,
+					       ARRAY_SIZE(sh4_ssi_dai));
 }
 
 static struct platform_driver sh4_ssi_driver = {
@@ -401,7 +396,6 @@  static struct platform_driver sh4_ssi_driver = {
 	},
 
 	.probe = sh4_soc_dai_probe,
-	.remove = sh4_soc_dai_remove,
 };
 
 module_platform_driver(sh4_ssi_driver);