return 0;
 }
 
-static int chv_pinctrl_remove(struct platform_device *pdev)
+static void chv_pinctrl_remove(struct platform_device *pdev)
 {
        struct intel_pinctrl *pctrl = platform_get_drvdata(pdev);
        const struct intel_community *community = &pctrl->communities[0];
        acpi_remove_address_space_handler(ACPI_HANDLE(&pdev->dev),
                                          community->acpi_space_id,
                                          chv_pinctrl_mmio_access_handler);
-
-       return 0;
 }
 
 static int chv_pinctrl_suspend_noirq(struct device *dev)
 
 static struct platform_driver chv_pinctrl_driver = {
        .probe = chv_pinctrl_probe,
-       .remove = chv_pinctrl_remove,
+       .remove_new = chv_pinctrl_remove,
        .driver = {
                .name = "cherryview-pinctrl",
                .pm = pm_sleep_ptr(&chv_pinctrl_pm_ops),