return err;
 }
 
-static int ehci_platform_remove(struct platform_device *dev)
+static void ehci_platform_remove(struct platform_device *dev)
 {
        struct usb_hcd *hcd = platform_get_drvdata(dev);
        struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
 
        if (pdata == &ehci_platform_defaults)
                dev->dev.platform_data = NULL;
-
-       return 0;
 }
 
 static int __maybe_unused ehci_platform_suspend(struct device *dev)
 static struct platform_driver ehci_platform_driver = {
        .id_table       = ehci_platform_table,
        .probe          = ehci_platform_probe,
-       .remove         = ehci_platform_remove,
+       .remove_new     = ehci_platform_remove,
        .shutdown       = usb_hcd_platform_shutdown,
        .driver         = {
                .name   = "ehci-platform",