uas: replace WARN_ON_ONCE() with lockdep_assert_held()

commit ab945eff8396bc3329cc97274320e8d2c6585077 upstream.

on some architecture spin_is_locked() always return false in
uniprocessor configuration and therefore it would be advise
to replace with lockdep_assert_held().

Signed-off-by: Sanjeev Sharma <Sanjeev_Sharma@mentor.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 21d2d52a3b262eabd5657f42f4b8187e180e616c..db6a57dfed44b710d9da90dcaf99e7734062a83c 100644 (file)
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -158,7 +158,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info *devinfo,
        struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp);
 
        uas_log_cmd_state(cmnd, caller);
-       WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
+       lockdep_assert_held(&devinfo->lock);
        WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED);
        cmdinfo->state |= COMMAND_ABORTED;
        cmdinfo->state &= ~IS_IN_WORK_LIST;
@@ -185,7 +185,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo)
        struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp);
        struct uas_dev_info *devinfo = cmnd->device->hostdata;
 
-       WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
+       lockdep_assert_held(&devinfo->lock);
        cmdinfo->state |= IS_IN_WORK_LIST;
        schedule_work(&devinfo->work);
 }
@@ -287,7 +287,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)
        struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp;
        struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;
 
-       WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
+       lockdep_assert_held(&devinfo->lock);
        if (cmdinfo->state & (COMMAND_INFLIGHT |
                              DATA_IN_URB_INFLIGHT |
                              DATA_OUT_URB_INFLIGHT |
@@ -626,7 +626,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd,
        struct urb *urb;
        int err;
 
-       WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
+       lockdep_assert_held(&devinfo->lock);
        if (cmdinfo->state & SUBMIT_STATUS_URB) {
                urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo->stream);
                if (!urb)