return ret;
 }
 
-static int sun8i_a83t_mipi_csi2_remove(struct platform_device *platform_dev)
+static void sun8i_a83t_mipi_csi2_remove(struct platform_device *platform_dev)
 {
        struct sun8i_a83t_mipi_csi2_device *csi2_dev =
                platform_get_drvdata(platform_dev);
 
        sun8i_a83t_mipi_csi2_bridge_cleanup(csi2_dev);
        sun8i_a83t_mipi_csi2_resources_cleanup(csi2_dev);
-
-       return 0;
 }
 
 static const struct of_device_id sun8i_a83t_mipi_csi2_of_match[] = {
 
 static struct platform_driver sun8i_a83t_mipi_csi2_platform_driver = {
        .probe  = sun8i_a83t_mipi_csi2_probe,
-       .remove = sun8i_a83t_mipi_csi2_remove,
+       .remove_new = sun8i_a83t_mipi_csi2_remove,
        .driver = {
                .name           = SUN8I_A83T_MIPI_CSI2_NAME,
                .of_match_table = of_match_ptr(sun8i_a83t_mipi_csi2_of_match),