[PATCH] aic7xxx: Remove redundant NULL check before kfree

[Syam Sidhardhan]

kfree on NULL pointer is a no-op.

Signed-off-by: Syam Sidhardhan <s.s...@samsung.com>
---
 drivers/scsi/aic7xxx/aic79xx_core.c |   12 ++++--------
 drivers/scsi/aic7xxx/aic7xxx_core.c |   16 ++++++----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c 
b/drivers/scsi/aic7xxx/aic79xx_core.c
index 0bcacf7..5fc36b0 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -6145,8 +6145,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;
 }
 
@@ -6213,12 +6212,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 --git a/drivers/scsi/aic7xxx/aic7xxx_core.c 
b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 10172a3..a145e7a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -2200,8 +2200,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
@@ -4482,8 +4481,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;
 }
 
@@ -4550,10 +4548,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
@@ -4958,8 +4954,8 @@ 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
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html