Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f491ecbb authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Sarah Sharp
Browse files

uas: replace BUG_ON() + WARN_ON() with WARN_ON_ONCE() 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 326349f8

drivers/usb/storage/uas.c

+10 −9
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static void uas_abort_work(struct uas_dev_info *devinfo) 
		struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd,

						      SCp);

		uas_log_cmd_state(cmnd, __func__);

		WARN_ON(cmdinfo->state & COMMAND_ABORTED);

		WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED);

		cmdinfo->state |= COMMAND_ABORTED;

		cmdinfo->state &= ~IS_IN_WORK_LIST;

		list_del(&cmdinfo->work);
@@ -169,7 +169,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(!spin_is_locked(&devinfo->lock));

	WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));

	list_add_tail(&cmdinfo->work, &devinfo->work_list);

	cmdinfo->state |= IS_IN_WORK_LIST;

	schedule_work(&devinfo->work);
@@ -187,7 +187,7 @@ static void uas_zap_dead(struct uas_dev_info *devinfo) 
		struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd,

						      SCp);

		uas_log_cmd_state(cmnd, __func__);

		WARN_ON(!(cmdinfo->state & COMMAND_ABORTED));

		WARN_ON_ONCE(!(cmdinfo->state & COMMAND_ABORTED));

		/* all urbs are killed, clear inflight bits */

		cmdinfo->state &= ~(COMMAND_INFLIGHT |

				    DATA_IN_URB_INFLIGHT |
@@ -271,13 +271,13 @@ 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(!spin_is_locked(&devinfo->lock));

	WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));

	if (cmdinfo->state & (COMMAND_INFLIGHT |

			      DATA_IN_URB_INFLIGHT |

			      DATA_OUT_URB_INFLIGHT |

			      UNLINK_DATA_URBS))

		return -EBUSY;

	BUG_ON(cmdinfo->state & COMMAND_COMPLETED);

	WARN_ON_ONCE(cmdinfo->state & COMMAND_COMPLETED);

	cmdinfo->state |= COMMAND_COMPLETED;

	usb_free_urb(cmdinfo->data_in_urb);

	usb_free_urb(cmdinfo->data_out_urb);
@@ -398,8 +398,9 @@ static void uas_data_cmplt(struct urb *urb) 
		sdb = scsi_out(cmnd);

		cmdinfo->state &= ~DATA_OUT_URB_INFLIGHT;

	}

	BUG_ON(sdb == NULL);

	if (urb->status) {

	if (sdb == NULL) {

		WARN_ON_ONCE(1);

	} else if (urb->status) {

		/* error: no data transfered */

		sdb->resid = sdb->length;

	} else {
@@ -573,7 +574,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd, 
	struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp;

	int err;



	WARN_ON(!spin_is_locked(&devinfo->lock));

	WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));

	if (cmdinfo->state & SUBMIT_STATUS_URB) {

		err = uas_submit_sense_urb(cmnd->device->host, gfp,

					   cmdinfo->stream);
@@ -771,7 +772,7 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd) 


	uas_log_cmd_state(cmnd, __func__);

	spin_lock_irqsave(&devinfo->lock, flags);

	WARN_ON(cmdinfo->state & COMMAND_ABORTED);

	WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED);

	cmdinfo->state |= COMMAND_ABORTED;

	list_add_tail(&cmdinfo->dead, &devinfo->dead_list);

	if (cmdinfo->state & IS_IN_WORK_LIST) {