aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Bulwahn <lukas.bulwahn@gmail.com>2022-03-15 07:15:20 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2022-03-15 14:07:11 -0400
commit66daf3e6b9936328cb28eaaa29dddfe96343cc85 (patch)
treeb30ef649c8a94df5864ae36425a65facfe872f98
parentscsi: bsg: Drop needless assignment in scsi_bsg_sg_io_fn() (diff)
downloadlinux-dev-66daf3e6b9936328cb28eaaa29dddfe96343cc85.tar.xz
linux-dev-66daf3e6b9936328cb28eaaa29dddfe96343cc85.zip
scsi: scsi_ioctl: Drop needless assignment in sg_io()
Commit ce70fd9a551a ("scsi: core: Remove the cmd field from struct scsi_request") refactored sg_io(), so that it does not allocate directly and hence does not return -ENOMEM in its error case. That makes a remaining assignment of -ENOMEM to the return variable needless. Drop this needless assignment in sg_io(). No functional change. No change in resulting object code. Link: https://lore.kernel.org/r/20220315061520.30745-1-lukas.bulwahn@gmail.com Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/scsi_ioctl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 0613015cae39..a480c4d589f5 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -434,7 +434,6 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode)
if (hdr->flags & SG_FLAG_Q_AT_HEAD)
at_head = 1;
- ret = -ENOMEM;
rq = scsi_alloc_request(sdev->request_queue, writing ?
REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);
if (IS_ERR(rq))