qla2xxx: list cursors are not null

PATCH New Dan Carpenter 1 participant 1 message Oct 14, 2010

Subsystems (3)

SCSI Kernel janitors QLogic QLA2XXX FC-SCSI driver

lore

Share & tools

lore

Dan Carpenter

author

2010-10-14 18:22 UTC #0 lore raw

PATCH 1/1 qla2xxx: list cursors are not null

This is just a cleanup.

The unneeded NULL check annoys static checkers because we already derefenced it and the we check it and then (if it's not the _safe() version) we dereference it again without checking. And the static checker is all, "Wah? Is it null or not?"

Signed-off-by Dan Carpenter <[email protected]>

drivers/scsi/qla2xxx/qla_init.c +1 -1

index c2d7bb8..f5cf356 100644
@@ -3830,7 +3830,7 @@ qla2x00_update_fcports(scsi_qla_host_t *base_vha)
 	/* Go with deferred removal of rport references. */
 	list_for_each_entry_safe(vha, tvp, &base_vha->hw->vp_list, list)
 		list_for_each_entry(fcport, &vha->vp_fcports, list)
-			if (fcport && fcport->drport &&
+			if (fcport->drport &&
 			    atomic_read(&fcport->state) != FCS_UNCONFIGURED)
 				qla2x00_rport_del(fcport);
 }

drivers/scsi/qla2xxx/qla_os.c +1 -1

index bdd53f0..374670b 100644
@@ -2351,7 +2351,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
 	ha = base_vha->hw;
 
 	list_for_each_entry_safe(vha, temp, &ha->vp_list, list) {
-		if (vha && vha->fc_vport)
+		if (vha->fc_vport)
 			fc_vport_terminate(vha->fc_vport);
 	}