| Message ID | 20220315055325.14974-1-lukas.bulwahn@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: bsg: drop needless assignment in scsi_bsg_sg_io_fn() | expand |
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
Lukas, > Commit ce70fd9a551a ("scsi: core: Remove the cmd field from struct > scsi_request") refactored scsi_bsg_sg_io_fn(), 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!
On Tue, 15 Mar 2022 06:53:25 +0100, Lukas Bulwahn wrote: > Commit ce70fd9a551a ("scsi: core: Remove the cmd field from struct > scsi_request") refactored scsi_bsg_sg_io_fn(), 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 scsi_bsg_sg_io_fn(). > > [...] Applied to 5.18/scsi-queue, thanks! [1/1] scsi: bsg: drop needless assignment in scsi_bsg_sg_io_fn() https://git.kernel.org/mkp/scsi/c/dc155e1acb18
diff --git a/drivers/scsi/scsi_bsg.c b/drivers/scsi/scsi_bsg.c index 8039c3c11a6e..96ee35256a16 100644 --- a/drivers/scsi/scsi_bsg.c +++ b/drivers/scsi/scsi_bsg.c @@ -31,7 +31,6 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, return PTR_ERR(rq); rq->timeout = timeout; - ret = -ENOMEM; scmd = blk_mq_rq_to_pdu(rq); scmd->cmd_len = hdr->request_len; if (scmd->cmd_len > sizeof(scmd->cmnd)) {
Commit ce70fd9a551a ("scsi: core: Remove the cmd field from struct scsi_request") refactored scsi_bsg_sg_io_fn(), 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 scsi_bsg_sg_io_fn(). No functional change. No change in resulting object code. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- Christoph, please ack. Martin, please pick this minor clean-up on your -next tree on top of the commit above. drivers/scsi/scsi_bsg.c | 1 - 1 file changed, 1 deletion(-)