usb: musb: gadget: get rid of stop_activity()

that function is pretty close to a no-op by now,
all we need is a call to musb_stop().

Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index b2d9040c7685ba6a63ebcfa4ec59676e931369b1..4c481cd66c77a9724dc5725d8e950dbc51bf23a5 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1876,44 +1876,6 @@ err:
        return retval;
 }
 
-static void stop_activity(struct musb *musb, struct usb_gadget_driver *driver)
-{
-       int                     i;
-       struct musb_hw_ep       *hw_ep;
-
-       /* don't disconnect if it's not connected */
-       if (musb->g.speed == USB_SPEED_UNKNOWN)
-               driver = NULL;
-       else
-               musb->g.speed = USB_SPEED_UNKNOWN;
-
-       /* deactivate the hardware */
-       if (musb->softconnect) {
-               musb->softconnect = 0;
-               musb_pullup(musb, 0);
-       }
-       musb_stop(musb);
-
-       /* killing any outstanding requests will quiesce the driver;
-        * then report disconnect
-        */
-       if (driver) {
-               for (i = 0, hw_ep = musb->endpoints;
-                               i < musb->nr_endpoints;
-                               i++, hw_ep++) {
-                       musb_ep_select(musb->mregs, i);
-                       if (hw_ep->is_shared_fifo /* || !epnum */) {
-                               nuke(&hw_ep->ep_in, -ESHUTDOWN);
-                       } else {
-                               if (hw_ep->max_packet_sz_tx)
-                                       nuke(&hw_ep->ep_in, -ESHUTDOWN);
-                               if (hw_ep->max_packet_sz_rx)
-                                       nuke(&hw_ep->ep_out, -ESHUTDOWN);
-                       }
-               }
-       }
-}
-
 /*
  * Unregister the gadget driver. Used by gadget drivers when
  * unregistering themselves from the controller.
@@ -1940,7 +1902,7 @@ static int musb_gadget_stop(struct usb_gadget *g)
        (void) musb_gadget_vbus_draw(&musb->g, 0);
 
        musb->xceiv->otg->state = OTG_STATE_UNDEFINED;
-       stop_activity(musb, NULL);
+       musb_stop(musb);
        otg_set_peripheral(musb->xceiv->otg, NULL);
 
        musb->is_active = 0;