scsi: aic7xxx: Remove unnecessary NULL checks before kfree

There are a number of places in the aic7xxx driver where a NULL check is
performed before a kfree(). However, kfree() already performs NULL checks
so this is unnecessary. Remove the checks.

Issue identified with Coccinelle.

Link: https://lore.kernel.org/r/20200403164712.49579-1-alex.dewar@gmx.co.uk
Signed-off-by: Alex Dewar <alex.dewar@gmx.co.uk>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index c381637..e4a09b9 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -3662,8 +3662,7 @@ ahd_free_tstate(struct ahd_softc *ahd, u_int scsi_id, char channel, int force)
                return;
 
        tstate = ahd->enabled_targets[scsi_id];
-       if (tstate != NULL)
-               kfree(tstate);
+       kfree(tstate);
        ahd->enabled_targets[scsi_id] = NULL;
 }
 #endif
@@ -6119,8 +6118,7 @@ ahd_set_unit(struct ahd_softc *ahd, int unit)
 void
 ahd_set_name(struct ahd_softc *ahd, char *name)
 {
-       if (ahd->name != NULL)
-               kfree(ahd->name);
+       kfree(ahd->name);
        ahd->name = name;
 }
 
@@ -6181,12 +6179,9 @@ ahd_free(struct ahd_softc *ahd)
                kfree(ahd->black_hole);
        }
 #endif
-       if (ahd->name != NULL)
-               kfree(ahd->name);
-       if (ahd->seep_config != NULL)
-               kfree(ahd->seep_config);
-       if (ahd->saved_stack != NULL)
-               kfree(ahd->saved_stack);
+       kfree(ahd->name);
+       kfree(ahd->seep_config);
+       kfree(ahd->saved_stack);
        kfree(ahd);
        return;
 }

diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 36a7ea1..3d4df90 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -2178,8 +2178,7 @@ ahc_free_tstate(struct ahc_softc *ahc, u_int scsi_id, char channel, int force)
        if (channel == 'B')
                scsi_id += 8;
        tstate = ahc->enabled_targets[scsi_id];
-       if (tstate != NULL)
-               kfree(tstate);
+       kfree(tstate);
        ahc->enabled_targets[scsi_id] = NULL;
 }
 #endif
@@ -4453,8 +4452,7 @@ ahc_set_unit(struct ahc_softc *ahc, int unit)
 void
 ahc_set_name(struct ahc_softc *ahc, char *name)
 {
-       if (ahc->name != NULL)
-               kfree(ahc->name);
+       kfree(ahc->name);
        ahc->name = name;
 }
 
@@ -4515,10 +4513,8 @@ ahc_free(struct ahc_softc *ahc)
                kfree(ahc->black_hole);
        }
 #endif
-       if (ahc->name != NULL)
-               kfree(ahc->name);
-       if (ahc->seep_config != NULL)
-               kfree(ahc->seep_config);
+       kfree(ahc->name);
+       kfree(ahc->seep_config);
        kfree(ahc);
        return;
 }
@@ -4927,8 +4923,7 @@ ahc_fini_scbdata(struct ahc_softc *ahc)
        case 0:
                break;
        }
-       if (scb_data->scbarray != NULL)
-               kfree(scb_data->scbarray);
+       kfree(scb_data->scbarray);
 }
 
 static void