aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/m66592-udc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/m66592-udc.c')
-rw-r--r--drivers/usb/gadget/m66592-udc.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index c1b8c2dd808d..866ef0999247 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1471,7 +1471,6 @@ static int m66592_udc_start(struct usb_gadget *g,
1471 /* hook up the driver */ 1471 /* hook up the driver */
1472 driver->driver.bus = NULL; 1472 driver->driver.bus = NULL;
1473 m66592->driver = driver; 1473 m66592->driver = driver;
1474 m66592->gadget.dev.driver = &driver->driver;
1475 1474
1476 m66592_bset(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0); 1475 m66592_bset(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0);
1477 if (m66592_read(m66592, M66592_INTSTS0) & M66592_VBSTS) { 1476 if (m66592_read(m66592, M66592_INTSTS0) & M66592_VBSTS) {
@@ -1494,7 +1493,6 @@ static int m66592_udc_stop(struct usb_gadget *g,
1494 m66592_bclr(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0); 1493 m66592_bclr(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0);
1495 1494
1496 driver->unbind(&m66592->gadget); 1495 driver->unbind(&m66592->gadget);
1497 m66592->gadget.dev.driver = NULL;
1498 1496
1499 init_controller(m66592); 1497 init_controller(m66592);
1500 disable_controller(m66592); 1498 disable_controller(m66592);
@@ -1538,7 +1536,6 @@ static int __exit m66592_remove(struct platform_device *pdev)
1538 struct m66592 *m66592 = dev_get_drvdata(&pdev->dev); 1536 struct m66592 *m66592 = dev_get_drvdata(&pdev->dev);
1539 1537
1540 usb_del_gadget_udc(&m66592->gadget); 1538 usb_del_gadget_udc(&m66592->gadget);
1541 device_del(&m66592->gadget.dev);
1542 1539
1543 del_timer_sync(&m66592->timer); 1540 del_timer_sync(&m66592->timer);
1544 iounmap(m66592->reg); 1541 iounmap(m66592->reg);
@@ -1608,12 +1605,7 @@ static int __init m66592_probe(struct platform_device *pdev)
1608 dev_set_drvdata(&pdev->dev, m66592); 1605 dev_set_drvdata(&pdev->dev, m66592);
1609 1606
1610 m66592->gadget.ops = &m66592_gadget_ops; 1607 m66592->gadget.ops = &m66592_gadget_ops;
1611 device_initialize(&m66592->gadget.dev);
1612 dev_set_name(&m66592->gadget.dev, "gadget");
1613 m66592->gadget.max_speed = USB_SPEED_HIGH; 1608 m66592->gadget.max_speed = USB_SPEED_HIGH;
1614 m66592->gadget.dev.parent = &pdev->dev;
1615 m66592->gadget.dev.dma_mask = pdev->dev.dma_mask;
1616 m66592->gadget.dev.release = pdev->dev.release;
1617 m66592->gadget.name = udc_name; 1609 m66592->gadget.name = udc_name;
1618 1610
1619 init_timer(&m66592->timer); 1611 init_timer(&m66592->timer);
@@ -1674,12 +1666,6 @@ static int __init m66592_probe(struct platform_device *pdev)
1674 1666
1675 init_controller(m66592); 1667 init_controller(m66592);
1676 1668
1677 ret = device_add(&m66592->gadget.dev);
1678 if (ret) {
1679 pr_err("device_add error (%d)\n", ret);
1680 goto err_device_add;
1681 }
1682
1683 ret = usb_add_gadget_udc(&pdev->dev, &m66592->gadget); 1669 ret = usb_add_gadget_udc(&pdev->dev, &m66592->gadget);
1684 if (ret) 1670 if (ret)
1685 goto err_add_udc; 1671 goto err_add_udc;
@@ -1688,9 +1674,6 @@ static int __init m66592_probe(struct platform_device *pdev)
1688 return 0; 1674 return 0;
1689 1675
1690err_add_udc: 1676err_add_udc:
1691 device_del(&m66592->gadget.dev);
1692
1693err_device_add:
1694 m66592_free_request(&m66592->ep[0].ep, m66592->ep0_req); 1677 m66592_free_request(&m66592->ep[0].ep, m66592->ep0_req);
1695 1678
1696clean_up3: 1679clean_up3: