diff options
Diffstat (limited to 'drivers/usb/gadget/s3c2410_udc.c')
-rw-r--r-- | drivers/usb/gadget/s3c2410_udc.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 08f89652533b..d0e75e1b3ccb 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
@@ -1674,7 +1674,6 @@ static int s3c2410_udc_start(struct usb_gadget *g, | |||
1674 | 1674 | ||
1675 | /* Hook the driver */ | 1675 | /* Hook the driver */ |
1676 | udc->driver = driver; | 1676 | udc->driver = driver; |
1677 | udc->gadget.dev.driver = &driver->driver; | ||
1678 | 1677 | ||
1679 | /* Enable udc */ | 1678 | /* Enable udc */ |
1680 | s3c2410_udc_enable(udc); | 1679 | s3c2410_udc_enable(udc); |
@@ -1824,17 +1823,6 @@ static int s3c2410_udc_probe(struct platform_device *pdev) | |||
1824 | goto err_mem; | 1823 | goto err_mem; |
1825 | } | 1824 | } |
1826 | 1825 | ||
1827 | device_initialize(&udc->gadget.dev); | ||
1828 | udc->gadget.dev.parent = &pdev->dev; | ||
1829 | udc->gadget.dev.dma_mask = pdev->dev.dma_mask; | ||
1830 | |||
1831 | /* Bind the driver */ | ||
1832 | retval = device_add(&udc->gadget.dev); | ||
1833 | if (retval) { | ||
1834 | dev_err(&udc->gadget.dev, "Error in device_add() : %d\n", retval); | ||
1835 | goto err_device_add; | ||
1836 | } | ||
1837 | |||
1838 | the_controller = udc; | 1826 | the_controller = udc; |
1839 | platform_set_drvdata(pdev, udc); | 1827 | platform_set_drvdata(pdev, udc); |
1840 | 1828 | ||
@@ -1923,8 +1911,6 @@ err_gpio_claim: | |||
1923 | err_int: | 1911 | err_int: |
1924 | free_irq(IRQ_USBD, udc); | 1912 | free_irq(IRQ_USBD, udc); |
1925 | err_map: | 1913 | err_map: |
1926 | device_unregister(&udc->gadget.dev); | ||
1927 | err_device_add: | ||
1928 | iounmap(base_addr); | 1914 | iounmap(base_addr); |
1929 | err_mem: | 1915 | err_mem: |
1930 | release_mem_region(rsrc_start, rsrc_len); | 1916 | release_mem_region(rsrc_start, rsrc_len); |
@@ -1946,7 +1932,6 @@ static int s3c2410_udc_remove(struct platform_device *pdev) | |||
1946 | return -EBUSY; | 1932 | return -EBUSY; |
1947 | 1933 | ||
1948 | usb_del_gadget_udc(&udc->gadget); | 1934 | usb_del_gadget_udc(&udc->gadget); |
1949 | device_unregister(&udc->gadget.dev); | ||
1950 | debugfs_remove(udc->regs_info); | 1935 | debugfs_remove(udc->regs_info); |
1951 | 1936 | ||
1952 | if (udc_info && !udc_info->udc_command && | 1937 | if (udc_info && !udc_info->udc_command && |