Commit 00da6a70 authored Apr 27, 2021 by Hannes Reinecke Committed by Martin K. Petersen May 31, 2021

scsi: st: Return error code in st_scsi_execute()

The callers to st_scsi_execute() already check for negative return values,
so we can drop the use of DRIVER_ERROR and return the actual error code.

Link: https://lore.kernel.org/r/20210427083046.31620-2-hare@suse.de


Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Kai Mäkisara <kai.makisara@kolumbus.fi>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 40d2fd05

drivers/scsi/st.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@ static int st_scsi_execute(struct st_request SRpnt, const unsigned char cmd,
		data_direction == DMA_TO_DEVICE ?
		REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0);
		if (IS_ERR(req))
		return DRIVER_ERROR << 24;
		return PTR_ERR(req);
		rq = scsi_req(req);
		req->rq_flags \|= RQF_QUIET;

		@@ -562,7 +562,7 @@ static int st_scsi_execute(struct st_request SRpnt, const unsigned char cmd,
		GFP_KERNEL);
		if (err) {
		blk_put_request(req);
		return DRIVER_ERROR << 24;
		return err;
		}
		}