return err;
 }
 
-static int pxa_camera_remove(struct platform_device *pdev)
+static void pxa_camera_remove(struct platform_device *pdev)
 {
        struct pxa_camera_dev *pcdev = platform_get_drvdata(pdev);
 
        v4l2_device_unregister(&pcdev->v4l2_dev);
 
        dev_info(&pdev->dev, "PXA Camera driver unloaded\n");
-
-       return 0;
 }
 
 static const struct dev_pm_ops pxa_camera_pm = {
                .of_match_table = of_match_ptr(pxa_camera_of_match),
        },
        .probe          = pxa_camera_probe,
-       .remove         = pxa_camera_remove,
+       .remove_new     = pxa_camera_remove,
 };
 
 module_platform_driver(pxa_camera_driver);