]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
usb: gadget: s3c-hsotg: let udc-core manage gadget->dev
authorFelipe Balbi <balbi@ti.com>
Thu, 24 Jan 2013 15:03:10 +0000 (17:03 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 18 Mar 2013 09:16:51 +0000 (11:16 +0200)
By simply setting a flag, we can drop some
boilerplate code.

Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/s3c-hsotg.c

index c26564f29a2cd9e5b1eb31c3b43c5c2929bc8e24..5fbd233eb6a0ef9f191cf7e5635a059dbe97feab 100644 (file)
@@ -3567,17 +3567,13 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 
        dev_info(dev, "regs %p, irq %d\n", hsotg->regs, hsotg->irq);
 
-       device_initialize(&hsotg->gadget.dev);
-
-       dev_set_name(&hsotg->gadget.dev, "gadget");
-
        hsotg->gadget.max_speed = USB_SPEED_HIGH;
        hsotg->gadget.ops = &s3c_hsotg_gadget_ops;
        hsotg->gadget.name = dev_name(dev);
-
        hsotg->gadget.dev.parent = dev;
        hsotg->gadget.dev.dma_mask = dev->dma_mask;
        hsotg->gadget.dev.release = s3c_hsotg_release;
+       hsotg->gadget.register_my_device = true;
 
        /* reset the system */
 
@@ -3658,12 +3654,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 
        s3c_hsotg_phy_disable(hsotg);
 
-       ret = device_add(&hsotg->gadget.dev);
-       if (ret) {
-               put_device(&hsotg->gadget.dev);
-               goto err_ep_mem;
-       }
-
        ret = usb_add_gadget_udc(&pdev->dev, &hsotg->gadget);
        if (ret)
                goto err_ep_mem;
@@ -3702,10 +3692,8 @@ static int s3c_hsotg_remove(struct platform_device *pdev)
        }
 
        s3c_hsotg_phy_disable(hsotg);
-
        clk_disable_unprepare(hsotg->clk);
 
-       device_unregister(&hsotg->gadget.dev);
        return 0;
 }