aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-04-10 15:55:43 -0400
committerFelipe Balbi <balbi@ti.com>2013-05-28 12:22:22 -0400
commitfe4cb0912f8e737f8e4b8b38b9e692f8062f5423 (patch)
treea2dc4b7299cb6113fee81f5cd0543cadbc1ce38b /drivers/usb/musb
parent0b3eba442d4810df4bdd46d6c3e189c9e7760137 (diff)
usb: musb: gadget: remove hcd initialization
This will be done from a more appropriate location and as it doesn't work anyway, it can safely be removed before the other changes. Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r--drivers/usb/musb/musb_gadget.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index ba7092349fa9..0414bc19d009 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1820,7 +1820,6 @@ static int musb_gadget_start(struct usb_gadget *g,
1820{ 1820{
1821 struct musb *musb = gadget_to_musb(g); 1821 struct musb *musb = gadget_to_musb(g);
1822 struct usb_otg *otg = musb->xceiv->otg; 1822 struct usb_otg *otg = musb->xceiv->otg;
1823 struct usb_hcd *hcd = musb_to_hcd(musb);
1824 unsigned long flags; 1823 unsigned long flags;
1825 int retval = 0; 1824 int retval = 0;
1826 1825
@@ -1847,17 +1846,9 @@ static int musb_gadget_start(struct usb_gadget *g,
1847 * handles power budgeting ... this way also 1846 * handles power budgeting ... this way also
1848 * ensures HdrcStart is indirectly called. 1847 * ensures HdrcStart is indirectly called.
1849 */ 1848 */
1850 retval = usb_add_hcd(hcd, 0, 0);
1851 if (retval < 0) {
1852 dev_dbg(musb->controller, "add_hcd failed, %d\n", retval);
1853 goto err;
1854 }
1855
1856 if (musb->xceiv->last_event == USB_EVENT_ID) 1849 if (musb->xceiv->last_event == USB_EVENT_ID)
1857 musb_platform_set_vbus(musb, 1); 1850 musb_platform_set_vbus(musb, 1);
1858 1851
1859 hcd->self.uses_pio_for_control = 1;
1860
1861 if (musb->xceiv->last_event == USB_EVENT_NONE) 1852 if (musb->xceiv->last_event == USB_EVENT_NONE)
1862 pm_runtime_put(musb->controller); 1853 pm_runtime_put(musb->controller);
1863 1854
@@ -1942,7 +1933,6 @@ static int musb_gadget_stop(struct usb_gadget *g,
1942 musb_platform_try_idle(musb, 0); 1933 musb_platform_try_idle(musb, 0);
1943 spin_unlock_irqrestore(&musb->lock, flags); 1934 spin_unlock_irqrestore(&musb->lock, flags);
1944 1935
1945 usb_remove_hcd(musb_to_hcd(musb));
1946 /* 1936 /*
1947 * FIXME we need to be able to register another 1937 * FIXME we need to be able to register another
1948 * gadget driver here and have everything work; 1938 * gadget driver here and have everything work;