Skip to contentSkip to conversation

scsi: scsi_ioctl:drop needless assignment in sg_io()

PATCH Applied Lukas Bulwahn 3 participants 4 messages Mar 15, 2022 – Mar 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
Christoph, please ack.

Martin, please pick this minor clean-up on your -next tree on top of the commit above.

 drivers/scsi/scsi_ioctl.c | 1 -
 1 file changed, 1 deletion(-)
drivers/scsi/scsi_ioctl.c +0 -1
index 0613015cae39..a480c4d589f5 100644
@@ -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))
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Lukas Bulwahn

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.

Looks good:

#2 lore raw
In reply to Lukas Bulwahn

Lukas,

Quoted 5 lines

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.

Applied to 5.18/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#3 lore raw
In reply to Lukas Bulwahn
Quoted 8 lines · Lukas Bulwahn

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().

[...]

Applied to 5.18/scsi-queue, thanks!

[1/1] scsi: scsi_ioctl:drop needless assignment in sg_io()

      https://git.kernel.org/mkp/scsi/c/66daf3e6b993
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering