usb: musb: drop a gigantic amount of ifdeferry
the MUSB IP is always OTG, so there's no point in adding so many ifdefs on the code. Drop those and always compile the driver for OTG support. This also allows us to drop the useless "driver mode" choice. For doing that, we need to make musb depend on both Host and Peripheral side. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -2048,9 +2048,7 @@ static int musb_gadget_stop(struct usb_gadget_driver *driver)
|
||||
|
||||
spin_lock_irqsave(&musb->lock, flags);
|
||||
|
||||
#ifdef CONFIG_USB_MUSB_OTG
|
||||
musb_hnp_stop(musb);
|
||||
#endif
|
||||
|
||||
(void) musb_gadget_vbus_draw(&musb->g, 0);
|
||||
|
||||
@@ -2171,7 +2169,6 @@ void musb_g_disconnect(struct musb *musb)
|
||||
|
||||
switch (musb->xceiv->state) {
|
||||
default:
|
||||
#ifdef CONFIG_USB_MUSB_OTG
|
||||
dev_dbg(musb->controller, "Unhandled disconnect %s, setting a_idle\n",
|
||||
otg_state_string(musb->xceiv->state));
|
||||
musb->xceiv->state = OTG_STATE_A_IDLE;
|
||||
@@ -2183,7 +2180,6 @@ void musb_g_disconnect(struct musb *musb)
|
||||
break;
|
||||
case OTG_STATE_B_WAIT_ACON:
|
||||
case OTG_STATE_B_HOST:
|
||||
#endif
|
||||
case OTG_STATE_B_PERIPHERAL:
|
||||
case OTG_STATE_B_IDLE:
|
||||
musb->xceiv->state = OTG_STATE_B_IDLE;
|
||||
|
Reference in New Issue
Block a user