| Message ID | 20210327230650.25803-1-colin.king@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: qedi: emove redundant assignment to variable err | expand |
> -----Original Message----- > From: Colin King <colin.king@canonical.com> > Sent: Sunday, March 28, 2021 4:37 AM > To: Nilesh Javali <njavali@marvell.com>; Manish Rangankar > <mrangankar@marvell.com>; GR-QLogic-Storage-Upstream <GR-QLogic- > Storage-Upstream@marvell.com>; James E . J . Bottomley > <jejb@linux.ibm.com>; Martin K . Petersen <martin.petersen@oracle.com>; > linux-scsi@vger.kernel.org > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [EXT] [PATCH] scsi: qedi: emove redundant assignment to variable err > > External Email > > ---------------------------------------------------------------------- > From: Colin Ian King <colin.king@canonical.com> > > variable err is assigned -ENOMEM followed by an error return path via label > err_udev that does not access the variable and returns with the -ENOMEM error > return code. The assignment to err is redundant and can be removed. > > Addresses-Coverity: ("Unused value") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/scsi/qedi/qedi_main.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c index > 69c5b5ee2169..2455d1448a7e 100644 > --- a/drivers/scsi/qedi/qedi_main.c > +++ b/drivers/scsi/qedi/qedi_main.c > @@ -276,10 +276,8 @@ static int qedi_alloc_uio_rings(struct qedi_ctx *qedi) > } > > udev = kzalloc(sizeof(*udev), GFP_KERNEL); > - if (!udev) { > - rc = -ENOMEM; > + if (!udev) > goto err_udev; > - } > > udev->uio_dev = -1; > > -- > 2.30.2 Thanks, Acked-by: Manish Rangankar <mrangankar@marvell.com>
On Sat, 27 Mar 2021 23:06:50 +0000, Colin King wrote: > variable err is assigned -ENOMEM followed by an error return path > via label err_udev that does not access the variable and returns > with the -ENOMEM error return code. The assignment to err is > redundant and can be removed. Applied to 5.13/scsi-queue, thanks! [1/1] scsi: qedi: emove redundant assignment to variable err https://git.kernel.org/mkp/scsi/c/8dc602529681 -- Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c index 69c5b5ee2169..2455d1448a7e 100644 --- a/drivers/scsi/qedi/qedi_main.c +++ b/drivers/scsi/qedi/qedi_main.c @@ -276,10 +276,8 @@ static int qedi_alloc_uio_rings(struct qedi_ctx *qedi) } udev = kzalloc(sizeof(*udev), GFP_KERNEL); - if (!udev) { - rc = -ENOMEM; + if (!udev) goto err_udev; - } udev->uio_dev = -1;