mpt2sas: Remove unnecessary use of a boolean variable

PATCH Superseded Quentin Lambert 2 participants 2 messages Dec 19, 2014

Subsystems (2)

SCSI Kernel janitors

lore

Share & tools

lore

Quentin Lambert

author

2014-12-19 11:13 UTC #0 lore raw

PATCH 3/3 mpt2sas: Remove unnecessary use of a boolean variable

Signed-off-by Quentin Lambert <[email protected]>

---
 drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

drivers/scsi/mpt2sas/mpt2sas_base.c +1 -5

index 58e4521..c31de9d 100644
@@ -1414,12 +1414,8 @@ _base_enable_msix(struct MPT2SAS_ADAPTER *ioc)
 	struct msix_entry *entries, *a;
 	int r;
 	int i;
-	u8 try_msix = 0;
 
-	if (msix_disable = -1 || msix_disable = 0)
-		try_msix = 1;
-
-	if (!try_msix)
+	if (msix_disable != -1 || msix_disable != 0)
 		goto try_ioapic;
 
 	if (_base_check_enable_msix(ioc) != 0)

Signature · 1 line

1.9.1

Joe Perches

2014-12-19 12:26 UTC #1 lore raw

On Fri, 2014-12-19 at 12:13 +0100, Quentin Lambert wrote:
[]

drivers/scsi/mpt2sas/mpt2sas_base.c

Quoted 1 line

drivers/scsi/mpt2sas/mpt2sas_base.c +0 -0

[]

drivers/scsi/mpt2sas/mpt2sas_base.c _base_enable_msix(struct MPT2SAS_ADAPTER *ioc) · line 1419

Quoted 12 lines

drivers/scsi/mpt2sas/mpt2sas_base.c +1 -5

@@ -1414,12 +1414,8 @@ _base_enable_msix(struct MPT2SAS_ADAPTER *ioc)
 	struct msix_entry *entries, *a;
 	int r;
 	int i;
-	u8 try_msix = 0;
 
-	if (msix_disable = -1 || msix_disable = 0)
-		try_msix = 1;
-
-	if (!try_msix)
+	if (msix_disable != -1 || msix_disable != 0)
 		goto try_ioapic;

logic not the same.

Now needs && not ||