summary refs log tree commit diff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-08-28 10:48:35 +0800
committerMark Brown <broonie@kernel.org>2015-08-28 17:27:38 +0100
commit637ce53a1b1c489ff0e92aa00b8376464f697dc5 (patch)
tree4035ff6a3413d60106efdb00444ec846862ed52d
parentbc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff)
downloadlinux-637ce53a1b1c489ff0e92aa00b8376464f697dc5.tar.gz
ASoC: pxa-ssp: Convert to devm_snd_soc_register_component
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/pxa/pxa-ssp.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index fbe2e93d6edc..3da485ec1de7 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -813,14 +813,8 @@ static const struct of_device_id pxa_ssp_of_ids[] = {
 
 static int asoc_ssp_probe(struct platform_device *pdev)
 {
-	return snd_soc_register_component(&pdev->dev, &pxa_ssp_component,
-					  &pxa_ssp_dai, 1);
-}
-
-static int asoc_ssp_remove(struct platform_device *pdev)
-{
-	snd_soc_unregister_component(&pdev->dev);
-	return 0;
+	return devm_snd_soc_register_component(&pdev->dev, &pxa_ssp_component,
+					       &pxa_ssp_dai, 1);
 }
 
 static struct platform_driver asoc_ssp_driver = {
@@ -830,7 +824,6 @@ static struct platform_driver asoc_ssp_driver = {
 	},
 
 	.probe = asoc_ssp_probe,
-	.remove = asoc_ssp_remove,
 };
 
 module_platform_driver(asoc_ssp_driver);