dev_set_drvdata(&pdev->dev, host);
 
-       ret = snd_soc_register_component(&pdev->dev, &spdif_out_component,
-                                        &spdif_out_dai, 1);
+       ret = devm_snd_soc_register_component(&pdev->dev, &spdif_out_component,
+                                             &spdif_out_dai, 1);
        return ret;
 }
 
-static int spdif_out_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_component(&pdev->dev);
-
-       return 0;
-}
-
 #ifdef CONFIG_PM
 static int spdif_out_suspend(struct device *dev)
 {
 
 static struct platform_driver spdif_out_driver = {
        .probe          = spdif_out_probe,
-       .remove         = spdif_out_remove,
        .driver         = {
                .name   = "spdif-out",
                .owner  = THIS_MODULE,