[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20190514130036.7629-1-quentin.deslandes@itdev.co.uk>
Date: Tue, 14 May 2019 13:00:44 +0000
From: Quentin Deslandes <quentin.deslandes@...ev.co.uk>
To: "kernel-janitors@...r.kernel.org" <kernel-janitors@...r.kernel.org>
CC: Quentin Deslandes <quentin.deslandes@...ev.co.uk>,
Hannes Reinecke <hare@...e.com>,
"James E.J. Bottomley" <jejb@...ux.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
"linux-scsi@...r.kernel.org" <linux-scsi@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] scsi: aic7xxx: Remove NULL check before kfree()
Fix the following coccinelle warning by removing NULL check before
calling kfree():
NULL check before some freeing functions in not needed.
Signed-off-by: Quentin Deslandes <quentin.deslandes@...ev.co.uk>
---
drivers/scsi/aic7xxx/aic7xxx_core.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 3993f15e7ff6..fae4424d4442 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -2192,9 +2192,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(ahc->enabled_targets[scsi_id]);
ahc->enabled_targets[scsi_id] = NULL;
}
#endif
@@ -4474,8 +4472,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;
}
@@ -4536,10 +4533,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 +4939,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
--
2.17.1
Powered by blists - more mailing lists