forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: musb: gadget: remove hcd initialization

Browse source 
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>
This commit is contained in:
Daniel Mack 2013-04-10 21:55:43 +02:00 • committed by Felipe Balbi
commit fe4cb0912f
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/usb/musb/musb_gadget.c
View file

@ -1820,7 +1820,6 @@ static int musb_gadget_start(struct usb_gadget *g,
{ {
struct musb *musb = gadget_to_musb(g); struct musb *musb = gadget_to_musb(g);
struct usb_otg *otg = musb->xceiv->otg; struct usb_otg *otg = musb->xceiv->otg;
struct usb_hcd *hcd = musb_to_hcd(musb);
unsigned long flags; unsigned long flags;
int retval = 0; int retval = 0;
@ -1847,17 +1846,9 @@ static int musb_gadget_start(struct usb_gadget *g,
* handles power budgeting ... this way also * handles power budgeting ... this way also
* ensures HdrcStart is indirectly called. * ensures HdrcStart is indirectly called.
*/ */
retval = usb_add_hcd(hcd, 0, 0);
if (retval < 0) {
dev_dbg(musb->controller, "add_hcd failed, %d\n", retval);
goto err;
}
if (musb->xceiv->last_event == USB_EVENT_ID) if (musb->xceiv->last_event == USB_EVENT_ID)
musb_platform_set_vbus(musb, 1); musb_platform_set_vbus(musb, 1);
hcd->self.uses_pio_for_control = 1;
if (musb->xceiv->last_event == USB_EVENT_NONE) if (musb->xceiv->last_event == USB_EVENT_NONE)
pm_runtime_put(musb->controller); pm_runtime_put(musb->controller);
@ -1942,7 +1933,6 @@ static int musb_gadget_stop(struct usb_gadget *g,
musb_platform_try_idle(musb, 0); musb_platform_try_idle(musb, 0);
spin_unlock_irqrestore(&musb->lock, flags); spin_unlock_irqrestore(&musb->lock, flags);
usb_remove_hcd(musb_to_hcd(musb));
/* /*
* FIXME we need to be able to register another * FIXME we need to be able to register another
* gadget driver here and have everything work; * gadget driver here and have everything work;