lpfc: Remove NULL ptr check before kfree.

[backport of 600b57091effbdb680c067332c92de2a21c5d79d]
From: rkennedy <dick.kennedy@avagotech.com>

Orabug: 26439257

The check for NULL ptr is not necessary, kfree will check it.

Removing NULL ptr check.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
This patch was applied manually.

Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 6e7a024919a993480efd0daa713072faac3428fe..02fbbe2aad7b5de396b92086e6b90eca85e0fcae 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -4500,14 +4500,11 @@ lpfc_debugfs_terminate(struct lpfc_vport *vport)
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
        struct lpfc_hba   *phba = vport->phba;
 
-       if (vport->disc_trc) {
-               kfree(vport->disc_trc);
-               vport->disc_trc = NULL;
-       }
-       if (vport->debug_disc_trc) {
-               debugfs_remove(vport->debug_disc_trc); /* discovery_trace */
-               vport->debug_disc_trc = NULL;
-       }
+       kfree(vport->disc_trc);
+       vport->disc_trc = NULL;
+
+       debugfs_remove(vport->debug_disc_trc); /* discovery_trace */
+       vport->debug_disc_trc = NULL;
        if (vport->debug_nodelist) {
                debugfs_remove(vport->debug_nodelist); /* nodelist */
                vport->debug_nodelist = NULL;
@@ -4577,15 +4574,12 @@ lpfc_debugfs_terminate(struct lpfc_vport *vport)
                        phba->debug_readRef = NULL;
                }
 
-               if (phba->slow_ring_trc) {
-                       kfree(phba->slow_ring_trc);
-                       phba->slow_ring_trc = NULL;
-               }
-               if (phba->debug_slow_ring_trc) {
-                       /* slow_ring_trace */
-                       debugfs_remove(phba->debug_slow_ring_trc);
-                       phba->debug_slow_ring_trc = NULL;
-               }
+               kfree(phba->slow_ring_trc);
+               phba->slow_ring_trc = NULL;
+
+               /* slow_ring_trace */
+               debugfs_remove(phba->debug_slow_ring_trc);
+               phba->debug_slow_ring_trc = NULL;
 
                /*
                 * iDiag release