return rc;
 }
 
-static int dummy_udc_remove(struct platform_device *pdev)
+static void dummy_udc_remove(struct platform_device *pdev)
 {
        struct dummy    *dum = platform_get_drvdata(pdev);
 
        device_remove_file(&dum->gadget.dev, &dev_attr_function);
        usb_del_gadget_udc(&dum->gadget);
-       return 0;
 }
 
 static void dummy_udc_pm(struct dummy *dum, struct dummy_hcd *dum_hcd,
 
 static struct platform_driver dummy_udc_driver = {
        .probe          = dummy_udc_probe,
-       .remove         = dummy_udc_remove,
+       .remove_new     = dummy_udc_remove,
        .suspend        = dummy_udc_suspend,
        .resume         = dummy_udc_resume,
        .driver         = {
        return retval;
 }
 
-static int dummy_hcd_remove(struct platform_device *pdev)
+static void dummy_hcd_remove(struct platform_device *pdev)
 {
        struct dummy            *dum;
 
 
        dum->hs_hcd = NULL;
        dum->ss_hcd = NULL;
-
-       return 0;
 }
 
 static int dummy_hcd_suspend(struct platform_device *pdev, pm_message_t state)
 
 static struct platform_driver dummy_hcd_driver = {
        .probe          = dummy_hcd_probe,
-       .remove         = dummy_hcd_remove,
+       .remove_new     = dummy_hcd_remove,
        .suspend        = dummy_hcd_suspend,
        .resume         = dummy_hcd_resume,
        .driver         = {