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 = {
        },
 
        .probe = sh4_soc_dai_probe,
-       .remove = sh4_soc_dai_remove,
 };
 
 module_platform_driver(sh4_ssi_driver);