Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe4cb091 authored by Daniel Mack's avatar Daniel Mack Committed by Felipe Balbi
Browse files

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: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0b3eba44

drivers/usb/musb/musb_gadget.c

+0 −10
Original line number Diff line number Diff line
@@ -1820,7 +1820,6 @@ static int musb_gadget_start(struct usb_gadget *g, 
{

	struct musb		*musb = gadget_to_musb(g);

	struct usb_otg		*otg = musb->xceiv->otg;

	struct usb_hcd		*hcd = musb_to_hcd(musb);

	unsigned long		flags;

	int			retval = 0;
@@ -1847,17 +1846,9 @@ static int musb_gadget_start(struct usb_gadget *g, 
	 * handles power budgeting ... this way also

	 * 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)

		musb_platform_set_vbus(musb, 1);



	hcd->self.uses_pio_for_control = 1;



	if (musb->xceiv->last_event == USB_EVENT_NONE)

		pm_runtime_put(musb->controller);
@@ -1942,7 +1933,6 @@ static int musb_gadget_stop(struct usb_gadget *g, 
	musb_platform_try_idle(musb, 0);

	spin_unlock_irqrestore(&musb->lock, flags);



	usb_remove_hcd(musb_to_hcd(musb));

	/*

	 * FIXME we need to be able to register another

	 * gadget driver here and have everything work;