greybus: Revert "greybus: es2.c: don't use spin_lock_irq()"

This reverts commit b44c3b5b0307788750eb4c462ed5982236876a8b.

Someone decided that all use of spin_lock_irq was to be considered a bug
and went on a search-and-replace type "bug-fixing" spree last week.

This is however just plain wrong. Using spin_lock_irq is perfectly fine
in paths were interrupts have not been disabled, and this is in fact
even preferred over the lazy approach of always using spin_lock_irqsave
instead of understanding the code that is being written or modified.

All current uses of spin_lock_irq have already been vetted in this
respect. Also note that it is only used in functions that may sleep,
that is, in functions that must not be called with interrupts disabled
in the first place.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 2217445..5bdf2e1 100644 (file)
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -496,12 +496,11 @@ static void message_cancel(struct gb_message *message)
        struct gb_host_device *hd = message->operation->connection->hd;
        struct es2_ap_dev *es2 = hd_to_es2(hd);
        struct urb *urb;
-       unsigned long flags;
        int i;
 
        might_sleep();
 
-       spin_lock_irqsave(&es2->cport_out_urb_lock, flags);
+       spin_lock_irq(&es2->cport_out_urb_lock);
        urb = message->hcpriv;
 
        /* Prevent dynamically allocated urb from being deallocated. */
@@ -514,14 +513,14 @@ static void message_cancel(struct gb_message *message)
                        break;
                }
        }
-       spin_unlock_irqrestore(&es2->cport_out_urb_lock, flags);
+       spin_unlock_irq(&es2->cport_out_urb_lock);
 
        usb_kill_urb(urb);
 
        if (i < NUM_CPORT_OUT_URB) {
-               spin_lock_irqsave(&es2->cport_out_urb_lock, flags);
+               spin_lock_irq(&es2->cport_out_urb_lock);
                es2->cport_out_urb_cancelled[i] = false;
-               spin_unlock_irqrestore(&es2->cport_out_urb_lock, flags);
+               spin_unlock_irq(&es2->cport_out_urb_lock);
        }
 
        usb_free_urb(urb);