diff mbox series

scsi: mptfusion: remove redundant variable r

Message ID 20211205225901.54362-1-colin.i.king@gmail.com (mailing list archive)
State Accepted
Headers show
Series scsi: mptfusion: remove redundant variable r | expand

Commit Message

Colin Ian King Dec. 5, 2021, 10:59 p.m. UTC
Variable r is being assigned a value that is never read. The assignment
is redundant and so is the variable, so remove these. Remove unnecessary
the {} braces in the if statement too.

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

Comments

Martin K. Petersen Dec. 7, 2021, 3:22 a.m. UTC | #1
Colin,

> Variable r is being assigned a value that is never read. The assignment
> is redundant and so is the variable, so remove these. Remove unnecessary
> the {} braces in the if statement too.

Applied to 5.17/scsi-staging, thanks!
Martin K. Petersen Dec. 14, 2021, 4:40 a.m. UTC | #2
On Sun, 5 Dec 2021 22:59:01 +0000, Colin Ian King wrote:

> Variable r is being assigned a value that is never read. The assignment
> is redundant and so is the variable, so remove these. Remove unnecessary
> the {} braces in the if statement too.
> 
> 

Applied to 5.17/scsi-queue, thanks!

[1/1] scsi: mptfusion: remove redundant variable r
      https://git.kernel.org/mkp/scsi/c/c27fd25db39b
diff mbox series

Patch

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index b94d5e4fdc23..24a4532053e4 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1274,8 +1274,6 @@  mpt_send_handshake_request(u8 cb_idx, MPT_ADAPTER *ioc, int reqBytes, u32 *req,
 static int
 mpt_host_page_access_control(MPT_ADAPTER *ioc, u8 access_control_value, int sleepFlag)
 {
-	int	 r = 0;
-
 	/* return if in use */
 	if (CHIPREG_READ32(&ioc->chip->Doorbell)
 	    & MPI_DOORBELL_ACTIVE)
@@ -1289,9 +1287,9 @@  mpt_host_page_access_control(MPT_ADAPTER *ioc, u8 access_control_value, int slee
 		 (access_control_value<<12)));
 
 	/* Wait for IOC to clear Doorbell Status bit */
-	if ((r = WaitForDoorbellAck(ioc, 5, sleepFlag)) < 0) {
+	if (WaitForDoorbellAck(ioc, 5, sleepFlag) < 0)
 		return -2;
-	}else
+	else
 		return 0;
 }