usb: gadget: dummy_hcd: don't assign gadget.dev.release directly

[linux-2.6-block.git] / drivers / usb / gadget / dummy_hcd.c

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 8cf0c0f6fa1fb83bab5f26ab4d54a24e7bda3875..ce751555f6ba0ca061e94beb5f907fd9275eee7c 100644 (file)
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -912,7 +912,6 @@ static int dummy_udc_start(struct usb_gadget *g,
        dum->devstatus = 0;
 
        dum->driver = driver;
-       dum->gadget.dev.driver = &driver->driver;
        dev_dbg(udc_dev(dum), "binding gadget driver '%s'\n",
                        driver->driver.name);
        return 0;
@@ -927,7 +926,6 @@ static int dummy_udc_stop(struct usb_gadget *g,
        dev_dbg(udc_dev(dum), "unregister gadget driver '%s'\n",
                        driver->driver.name);
 
-       dum->gadget.dev.driver = NULL;
        dum->driver = NULL;
 
        return 0;
@@ -937,11 +935,6 @@ static int dummy_udc_stop(struct usb_gadget *g,
 
 /* The gadget structure is stored inside the hcd structure and will be
  * released along with it. */
-static void dummy_gadget_release(struct device *dev)
-{
-       return;
-}
-
 static void init_dummy_udc_hw(struct dummy *dum)
 {
        int i;
@@ -984,15 +977,7 @@ static int dummy_udc_probe(struct platform_device *pdev)
        dum->gadget.ops = &dummy_ops;
        dum->gadget.max_speed = USB_SPEED_SUPER;
 
-       dev_set_name(&dum->gadget.dev, "gadget");
        dum->gadget.dev.parent = &pdev->dev;
-       dum->gadget.dev.release = dummy_gadget_release;
-       rc = device_register(&dum->gadget.dev);
-       if (rc < 0) {
-               put_device(&dum->gadget.dev);
-               return rc;
-       }
-
        init_dummy_udc_hw(dum);
 
        rc = usb_add_gadget_udc(&pdev->dev, &dum->gadget);
@@ -1008,7 +993,6 @@ static int dummy_udc_probe(struct platform_device *pdev)
 err_dev:
        usb_del_gadget_udc(&dum->gadget);
 err_udc:
-       device_unregister(&dum->gadget.dev);
        return rc;
 }
 
@@ -1019,7 +1003,6 @@ static int dummy_udc_remove(struct platform_device *pdev)
        usb_del_gadget_udc(&dum->gadget);
        platform_set_drvdata(pdev, NULL);
        device_remove_file(&dum->gadget.dev, &dev_attr_function);
-       device_unregister(&dum->gadget.dev);
        return 0;
 }