Remove NULL-checks before free().

ok tb@

4 files changed, 21 insertions, 37 deletions

diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c
index e018ff91b08..7bf470b9659 100644
--- a/sys/dev/acpi/acpicpu.c
+++ b/sys/dev/acpi/acpicpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpicpu.c,v 1.71 2015/12/23 17:07:09 jcs Exp $ */
+/* $OpenBSD: acpicpu.c,v 1.72 2015/12/29 04:46:28 mmcc Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
@@ -906,8 +906,7 @@ acpicpu_getpss(struct acpicpu_softc *sc)
 		return (1);
 	}
 
-	if (sc->sc_pss)
-		free(sc->sc_pss, M_DEVBUF, 0);
+	free(sc->sc_pss, M_DEVBUF, 0);
 
 	sc->sc_pss = mallocarray(res.length, sizeof(*sc->sc_pss), M_DEVBUF,
 	    M_WAITOK | M_ZERO);
diff --git a/sys/dev/firmload.c b/sys/dev/firmload.c
index 40ff1115afb..88346241c6a 100644
--- a/sys/dev/firmload.c
+++ b/sys/dev/firmload.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: firmload.c,v 1.13 2015/08/26 22:33:24 deraadt Exp $	*/
+/*	$OpenBSD: firmload.c,v 1.14 2015/12/29 04:46:28 mmcc Exp $	*/
 
 /*
  * Copyright (c) 2004 Theo de Raadt <deraadt@openbsd.org>
@@ -105,7 +105,6 @@ loadfirmware(const char *name, u_char **bufp, size_t *buflen)
 fail:
 	vput(nid.ni_vp);
 err:
-	if (path)
-		free(path, M_TEMP, MAXPATHLEN);
+	free(path, M_TEMP, MAXPATHLEN);
 	return (error);
 }
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 705a1b7ce92..d297ec2a58e 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.364 2015/08/19 19:05:24 krw Exp $ */
+/* $OpenBSD: softraid.c,v 1.365 2015/12/29 04:46:28 mmcc Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -1463,8 +1463,7 @@ unwind:
 		for (bc1 = SLIST_FIRST(&bv1->sbv_chunks); bc1 != NULL;
 		    bc1 = bc2) {
 			bc2 = SLIST_NEXT(bc1, sbc_link);
-			if (bc1->sbc_metadata)
-				free(bc1->sbc_metadata, M_DEVBUF, 0);
+			free(bc1->sbc_metadata, M_DEVBUF, 0);
 			free(bc1, M_DEVBUF, 0);
 		}
 		free(bv1, M_DEVBUF, 0);
@@ -1472,15 +1471,13 @@ unwind:
 	/* Free keydisks chunks. */
 	for (bc1 = SLIST_FIRST(&kdh); bc1 != NULL; bc1 = bc2) {
 		bc2 = SLIST_NEXT(bc1, sbc_link);
-		if (bc1->sbc_metadata)
-			free(bc1->sbc_metadata, M_DEVBUF, 0);
+		free(bc1->sbc_metadata, M_DEVBUF, 0);
 		free(bc1, M_DEVBUF, 0);
 	}
 	/* Free unallocated chunks. */
 	for (bc1 = SLIST_FIRST(&bch); bc1 != NULL; bc1 = bc2) {
 		bc2 = SLIST_NEXT(bc1, sbc_link);
-		if (bc1->sbc_metadata)
-			free(bc1->sbc_metadata, M_DEVBUF, 0);
+		free(bc1->sbc_metadata, M_DEVBUF, 0);
 		free(bc1, M_DEVBUF, 0);
 	}
 
@@ -1960,8 +1957,7 @@ sr_ccb_free(struct sr_discipline *sd)
 	while ((ccb = TAILQ_FIRST(&sd->sd_ccb_freeq)) != NULL)
 		TAILQ_REMOVE(&sd->sd_ccb_freeq, ccb, ccb_link);
 
-	if (sd->sd_ccb)
-		free(sd->sd_ccb, M_DEVBUF, 0);
+	free(sd->sd_ccb, M_DEVBUF, 0);
 }
 
 struct sr_ccb *
@@ -2985,16 +2981,13 @@ sr_hotspare(struct sr_softc *sc, dev_t dev)
 	goto done;
 
 fail:
-	if (hotspare)
-		free(hotspare, M_DEVBUF, 0);
+	free(hotspare, M_DEVBUF, 0);
 
 done:
-	if (sd && sd->sd_vol.sv_chunks)
-		free(sd->sd_vol.sv_chunks, M_DEVBUF, 0);
 	if (sd)
-		free(sd, M_DEVBUF, 0);
-	if (sm)
-		free(sm, M_DEVBUF, 0);
+		free(sd->sd_vol.sv_chunks, M_DEVBUF, 0);
+	free(sd, M_DEVBUF, 0);
+	free(sm, M_DEVBUF, 0);
 	if (open) {
 		VOP_CLOSE(vn, FREAD | FWRITE, NOCRED, curproc);
 		vput(vn);
@@ -3800,10 +3793,8 @@ sr_ioctl_installboot(struct sr_softc *sc, struct sr_discipline *sd,
 	rv = 0;
 
 done:
-	if (bootblk)
-		free(bootblk, M_DEVBUF, 0);
-	if (bootldr)
-		free(bootldr, M_DEVBUF, 0);
+	free(bootblk, M_DEVBUF, 0);
+	free(bootldr, M_DEVBUF, 0);
 
 	return (rv);
 }
@@ -3858,18 +3849,14 @@ sr_discipline_free(struct sr_discipline *sd)
 	    sd->sd_meta ? sd->sd_meta->ssd_devname : "nodev");
 	if (sd->sd_free_resources)
 		sd->sd_free_resources(sd);
-	if (sd->sd_vol.sv_chunks)
-		free(sd->sd_vol.sv_chunks, M_DEVBUF, 0);
-	if (sd->sd_meta)
-		free(sd->sd_meta, M_DEVBUF, 0);
-	if (sd->sd_meta_foreign)
-		free(sd->sd_meta_foreign, M_DEVBUF, 0);
+	free(sd->sd_vol.sv_chunks, M_DEVBUF, 0);
+	free(sd->sd_meta, M_DEVBUF, 0);
+	free(sd->sd_meta_foreign, M_DEVBUF, 0);
 
 	som = &sd->sd_meta_opt;
 	for (omi = SLIST_FIRST(som); omi != NULL; omi = omi_next) {
 		omi_next = SLIST_NEXT(omi, omi_link);
-		if (omi->omi_som)
-			free(omi->omi_som, M_DEVBUF, 0);
+		free(omi->omi_som, M_DEVBUF, 0);
 		free(omi, M_DEVBUF, 0);
 	}
 
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index f6bd47eb6cd..499125e3d44 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.123 2015/11/05 20:03:04 naddy Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.124 2015/12/29 04:46:28 mmcc Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -882,8 +882,7 @@ sr_crypto_read_key_disk(struct sr_discipline *sd, dev_t dev)
 done:
 	for (omi = SLIST_FIRST(&som); omi != NULL; omi = omi_next) {
 		omi_next = SLIST_NEXT(omi, omi_link);
-		if (omi->omi_som)
-			free(omi->omi_som, M_DEVBUF, 0);
+		free(omi->omi_som, M_DEVBUF, 0);
 		free(omi, M_DEVBUF, 0);
 	}