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);