USB: get rid of urb->lock

Now that urb->status isn't used, urb->lock doesn't protect anything.
This patch (as980) removes it and replaces it with a private mutex in
the one remaining place it was still used: usb_kill_urb.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 19f5f66c27..76db76fdb4 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -39,7 +39,6 @@ void usb_init_urb(struct urb *urb)
         if (urb) {
                 memset(urb, 0, sizeof(*urb));
                 kref_init(&urb->kref);
-                spin_lock_init(&urb->lock);
                 INIT_LIST_HEAD(&urb->anchor_list);
         }
 }
@@ -541,19 +540,21 @@ int usb_unlink_urb(struct urb *urb)
  */
 void usb_kill_urb(struct urb *urb)
 {
+        static DEFINE_MUTEX(reject_mutex);
+
         might_sleep();
         if (!(urb && urb->dev && urb->ep))
                 return;
-        spin_lock_irq(&urb->lock);
+        mutex_lock(&reject_mutex);
         ++urb->reject;
-        spin_unlock_irq(&urb->lock);
+        mutex_unlock(&reject_mutex);
 
         usb_hcd_unlink_urb(urb, -ENOENT);
         wait_event(usb_kill_urb_queue, atomic_read(&urb->use_count) == 0);
 
-        spin_lock_irq(&urb->lock);
+        mutex_lock(&reject_mutex);
         --urb->reject;
-        spin_unlock_irq(&urb->lock);
+        mutex_unlock(&reject_mutex);
 }
 
 /**