]> git.baikalelectronics.ru Git - kernel.git/commitdiff
scsi: scsi_ioctl: Drop needless assignment in sg_io()
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Tue, 15 Mar 2022 06:15:20 +0000 (07:15 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 15 Mar 2022 18:07:11 +0000 (14:07 -0400)
Commit e7def244f1b8 ("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>
drivers/scsi/scsi_ioctl.c

index 0613015cae39c58c0424d133e5449e164263a836..a480c4d589f5f75860e08df285b9fc2c61a0d453 100644 (file)
@@ -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))