[PATCH] scsi: message: fusion: remove redundant variable iocnum

Colin Ian King posted 1 patch 3 years, 8 months ago
drivers/message/fusion/mptctl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
[PATCH] scsi: message: fusion: remove redundant variable iocnum
Posted by Colin Ian King 3 years, 8 months ago
Variable iocnum is assigned a value that is never read, the assignment
and hence the variable are redundant can be removed. Also update the
the comment to reflect the correct name of the variable being updated.

Cleans up clang-scan warning:
drivers/message/fusion/mptctl.c:641:8: warning: Although the value stored
to 'iocnum' is used in the enclosing expression, the value is never
actually read from 'iocnum' [deadcode.DeadStores]

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 drivers/message/fusion/mptctl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index f9ee957072c3..673145c8936b 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -620,7 +620,6 @@ __mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	mpt_ioctl_header __user *uhdr = (void __user *) arg;
 	mpt_ioctl_header	 khdr;
-	int iocnum;
 	unsigned iocnumX;
 	int nonblock = (file->f_flags & O_NONBLOCK);
 	int ret;
@@ -634,12 +633,11 @@ __mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 	ret = -ENXIO;				/* (-6) No such device or address */
 
-	/* Verify intended MPT adapter - set iocnum and the adapter
+	/* Verify intended MPT adapter - set iocnumX and the adapter
 	 * pointer (iocp)
 	 */
 	iocnumX = khdr.iocnum & 0xFF;
-	if (((iocnum = mpt_verify_adapter(iocnumX, &iocp)) < 0) ||
-	    (iocp == NULL))
+	if ((mpt_verify_adapter(iocnumX, &iocp) < 0) || (iocp == NULL))
 		return -ENODEV;
 
 	if (!iocp->active) {
-- 
2.35.3
Re: [PATCH] scsi: message: fusion: remove redundant variable iocnum
Posted by Martin K. Petersen 3 years, 7 months ago
On Fri, 5 Aug 2022 12:32:14 +0100, Colin Ian King wrote:

> Variable iocnum is assigned a value that is never read, the assignment
> and hence the variable are redundant can be removed. Also update the
> the comment to reflect the correct name of the variable being updated.
> 
> Cleans up clang-scan warning:
> drivers/message/fusion/mptctl.c:641:8: warning: Although the value stored
> to 'iocnum' is used in the enclosing expression, the value is never
> actually read from 'iocnum' [deadcode.DeadStores]
> 
> [...]

Applied to 6.1/scsi-queue, thanks!

[1/1] scsi: message: fusion: remove redundant variable iocnum
      https://git.kernel.org/mkp/scsi/c/231159f33436

-- 
Martin K. Petersen	Oracle Linux Engineering
Re: [PATCH] scsi: message: fusion: remove redundant variable iocnum
Posted by Martin K. Petersen 3 years, 7 months ago
Colin,

> Variable iocnum is assigned a value that is never read, the assignment
> and hence the variable are redundant can be removed. Also update the
> the comment to reflect the correct name of the variable being updated.

Applied to 6.1/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering