[SCSI] qla2xxx: list cursors are not null
authorDan Carpenter <error27@gmail.com>
Wed, 22 Dec 2010 00:00:15 +0000 (16:00 -0800)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 23 Dec 2010 21:43:32 +0000 (15:43 -0600)
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 <error27@gmail.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/qla2xxx/qla_init.c
drivers/scsi/qla2xxx/qla_os.c

index 6f7cf39..e9b800e 100644 (file)
@@ -3888,7 +3888,7 @@ qla2x00_update_fcports(scsi_qla_host_t *base_vha)
        list_for_each_entry(vha, &base_vha->hw->vp_list, list) {
                atomic_inc(&vha->vref_count);
                list_for_each_entry(fcport, &vha->vp_fcports, list) {
-                       if (fcport && fcport->drport &&
+                       if (fcport->drport &&
                            atomic_read(&fcport->state) != FCS_UNCONFIGURED) {
                                spin_unlock_irqrestore(&ha->vport_slock, flags);
 
index df2c1e7..1814df8 100644 (file)
@@ -2371,7 +2371,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
        list_for_each_entry(vha, &ha->vp_list, list) {
                atomic_inc(&vha->vref_count);
 
-               if (vha && vha->fc_vport) {
+               if (vha->fc_vport) {
                        spin_unlock_irqrestore(&ha->vport_slock, flags);
 
                        fc_vport_terminate(vha->fc_vport);