usb: chipidea: Remove locking in ci_udc_start()
authorStephen Boyd <stephen.boyd@linaro.org>
Wed, 28 Dec 2016 22:56:54 +0000 (14:56 -0800)
committerPeter Chen <peter.chen@nxp.com>
Fri, 20 Jan 2017 03:25:10 +0000 (11:25 +0800)
We don't call hw_device_reset() with the ci->lock held, so it
doesn't seem like this lock here is protecting anything. Let's
just remove it. This allows us to call sleeping functions like
phy_init() from within the CI_HDRC_CONTROLLER_RESET_EVENT hook.

Acked-by: Peter Chen <peter.chen@nxp.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
drivers/usb/chipidea/udc.c

index cf132f0571375c8dfcdc7681ef718516620d38cb..732b281485deb2011678a6a0757c09d0f85bdbe6 100644 (file)
@@ -1725,7 +1725,6 @@ static int ci_udc_start(struct usb_gadget *gadget,
                         struct usb_gadget_driver *driver)
 {
        struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget);
-       unsigned long flags;
        int retval = -ENOMEM;
 
        if (driver->disconnect == NULL)
@@ -1752,7 +1751,6 @@ static int ci_udc_start(struct usb_gadget *gadget,
 
        pm_runtime_get_sync(&ci->gadget.dev);
        if (ci->vbus_active) {
-               spin_lock_irqsave(&ci->lock, flags);
                hw_device_reset(ci);
        } else {
                usb_udc_vbus_handler(&ci->gadget, false);
@@ -1761,7 +1759,6 @@ static int ci_udc_start(struct usb_gadget *gadget,
        }
 
        retval = hw_device_state(ci, ci->ep0out->qh.dma);
-       spin_unlock_irqrestore(&ci->lock, flags);
        if (retval)
                pm_runtime_put_sync(&ci->gadget.dev);