Make a few more mallocs use M_ZERO.

Submitted by:	josh@zipperup.org
Submitted by:	Robert Drehmel <robd@gmx.net>
Approved by:	imp

4 files changed, 8 insertions, 12 deletions

diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index be063d0..3d7b396 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -223,12 +223,11 @@ aha_alloc(int unit, bus_space_tag_t tag, bus_space_handle_t bsh)
 		}
 	}
 
-	aha = malloc(sizeof(struct aha_softc), M_DEVBUF, M_NOWAIT);
+	aha = malloc(sizeof(struct aha_softc), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (!aha) {
 		printf("aha%d: cannot malloc!\n", unit);
 		return NULL;    
 	}
-	bzero(aha, sizeof(struct aha_softc));
 	SLIST_INIT(&aha->free_aha_ccbs);
 	LIST_INIT(&aha->pending_ccbs);
 	SLIST_INIT(&aha->sg_maps);
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 2e44639..03a0cce 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -159,8 +159,8 @@ pccard_attach_card(device_t dev)
 		 * it might also just fall out of the FreeBSD resource model.
 		 *
 		 */
-		ivar = malloc(sizeof(struct pccard_ivar), M_DEVBUF, M_WAITOK);
-		bzero(ivar, sizeof *ivar);
+		ivar = malloc(sizeof(struct pccard_ivar), M_DEVBUF,
+		    M_WAITOK | M_ZERO);
 		child = device_add_child(dev, NULL, -1);
 		device_set_ivars(child, ivar);
 		ivar->fcn = pf;
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index dca15db..0fd70f0 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -756,8 +756,7 @@ pccard_parse_cis_tuple(struct pccard_tuple *tuple, void *arg)
 		}
 		if ((state->pf == NULL) || (state->gotmfc == 2)) {
 			state->pf = malloc(sizeof(*state->pf), M_DEVBUF,
-			    M_NOWAIT);
-			bzero(state->pf, sizeof(*state->pf));
+			    M_NOWAIT | M_ZERO);
 			state->pf->number = state->count++;
 			state->pf->last_config_index = -1;
 			STAILQ_INIT(&state->pf->cfe_head);
@@ -794,8 +793,7 @@ pccard_parse_cis_tuple(struct pccard_tuple *tuple, void *arg)
 			}
 			if (state->pf == NULL) {
 				state->pf = malloc(sizeof(*state->pf),
-				    M_DEVBUF, M_NOWAIT);
-				bzero(state->pf, sizeof(*state->pf));
+				    M_DEVBUF, M_NOWAIT | M_ZERO);
 				state->pf->number = state->count++;
 				state->pf->last_config_index = -1;
 				STAILQ_INIT(&state->pf->cfe_head);
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 55a1d3b..27f7af2 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -201,8 +201,7 @@ pccard_alloc_slot(struct slot_ctrl *ctrl)
 	if (slotno == MAXSLOT)
 		return(0);
 
-	MALLOC(slt, struct slot *, sizeof(*slt), M_DEVBUF, M_WAITOK);
-	bzero(slt, sizeof(*slt));
+	MALLOC(slt, struct slot *, sizeof(*slt), M_DEVBUF, M_WAITOK | M_ZERO);
 	make_dev(&crd_cdevsw, slotno, 0, 0, 0600, "card%d", slotno);
 	slt->ctrl = ctrl;
 	slt->slotnum = slotno;
@@ -226,8 +225,8 @@ allocate_driver(struct slot *slt, struct dev_desc *desc)
 
 	pccarddev = devclass_get_device(pccard_devclass, slt->slotnum);
 	irq = ffs(desc->irqmask) - 1;
-	MALLOC(devi, struct pccard_devinfo *, sizeof(*devi), M_DEVBUF, M_WAITOK);
-	bzero(devi, sizeof(*devi));
+	MALLOC(devi, struct pccard_devinfo *, sizeof(*devi), M_DEVBUF,
+	    M_WAITOK | M_ZERO);
 	strcpy(devi->name, desc->name);
 	/*
 	 *	Create an entry for the device under this slot.