NULL check before some freeing functions is not needed.

Signed-off-by: Thomas Meyer <tho...@m3y3r.de>
---

diff -u -p a/drivers/scsi/aic7xxx/aic79xx_core.c 
b/drivers/scsi/aic7xxx/aic79xx_core.c
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -3673,8 +3673,7 @@ ahd_free_tstate(struct ahd_softc *ahd, u
                return;
 
        tstate = ahd->enabled_targets[scsi_id];
-       if (tstate != NULL)
-               kfree(tstate);
+       kfree(tstate);
        ahd->enabled_targets[scsi_id] = NULL;
 }
 #endif
@@ -6136,8 +6135,7 @@ ahd_set_unit(struct ahd_softc *ahd, int
 void
 ahd_set_name(struct ahd_softc *ahd, char *name)
 {
-       if (ahd->name != NULL)
-               kfree(ahd->name);
+       kfree(ahd->name);
        ahd->name = name;
 }
 
@@ -6198,12 +6196,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);
 #ifndef __FreeBSD__
        kfree(ahd);
 #endif
diff -u -p a/drivers/scsi/aic7xxx/aic7xxx_core.c 
b/drivers/scsi/aic7xxx/aic7xxx_core.c
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -2193,8 +2193,7 @@ ahc_free_tstate(struct ahc_softc *ahc, u
        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
@@ -4474,8 +4473,7 @@ ahc_set_unit(struct ahc_softc *ahc, int
 void
 ahc_set_name(struct ahc_softc *ahc, char *name)
 {
-       if (ahc->name != NULL)
-               kfree(ahc->name);
+       kfree(ahc->name);
        ahc->name = name;
 }
 
@@ -4536,10 +4534,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);
 #ifndef __FreeBSD__
        kfree(ahc);
 #endif
@@ -4944,8 +4940,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

Reply via email to