More easy bzero() -> M_ZERO. Use 'p = malloc(sizeof(*p) ...'.

14 files changed, 34 insertions, 55 deletions

diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 6c3c2fc3721..b67de225c0c 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.36 2007/09/02 12:12:12 martin Exp $	*/
+/*	$OpenBSD: aac.c,v 1.37 2007/10/01 04:03:51 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -1207,10 +1207,9 @@ aac_alloc_commands(struct aac_softc *sc)
 	if (sc->total_fibs + AAC_FIB_COUNT > sc->aac_max_fibs)
 		return (ENOMEM);
 
-	fm = malloc(sizeof(struct aac_fibmap), M_DEVBUF, M_NOWAIT);
+	fm = malloc(sizeof(*fm), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (fm == NULL)
 		goto exit;
-	bzero(fm, sizeof(struct aac_fibmap));
 
 	/* allocate the FIBs in DMAable memory and load them */
 	if (bus_dmamem_alloc(sc->aac_dmat, AAC_FIBMAP_SIZE, PAGE_SIZE, 0,
@@ -1559,8 +1558,7 @@ aac_init(struct aac_softc *sc)
 	/* Allocate some FIBs and associated command structs */
 	TAILQ_INIT(&sc->aac_fibmap_tqh);
 	sc->aac_commands = malloc(AAC_MAX_FIBS * sizeof(struct aac_command),
-				  M_DEVBUF, M_WAITOK);
-	bzero(sc->aac_commands, AAC_MAX_FIBS * sizeof(struct aac_command));
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 	while (sc->total_fibs < AAC_MAX_FIBS) {
 		if (aac_alloc_commands(sc) != 0)
 			break;
diff --git a/sys/dev/ic/ac97.c b/sys/dev/ic/ac97.c
index eb9bcbce362..d19103ca1d3 100644
--- a/sys/dev/ic/ac97.c
+++ b/sys/dev/ic/ac97.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ac97.c,v 1.63 2007/07/27 01:48:04 ian Exp $	*/
+/*	$OpenBSD: ac97.c,v 1.64 2007/10/01 04:03:51 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Constantine Sapuntzakis
@@ -714,11 +714,9 @@ ac97_attach(struct ac97_host_if *host_if)
 
 	initfunc = NULL;
 
-	if (!(as = malloc(sizeof(struct ac97_softc), M_DEVBUF, M_NOWAIT)))
+	if (!(as = malloc(sizeof(*as), M_DEVBUF, M_NOWAIT | M_ZERO)))
 		return (ENOMEM);
 
-	bzero(as, sizeof(*as));
-
 	as->codec_if.vtbl = &ac97civ;
 	as->host_if = host_if;
 
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 88ecbc31745..6108636fd36 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.77 2007/08/28 18:34:38 deraadt Exp $ */
+/*	$OpenBSD: acx.c,v 1.78 2007/10/01 04:03:51 krw Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -1708,12 +1708,10 @@ acx_node_alloc(struct ieee80211com *ic)
 {
 	struct acx_node *wn;
 
-	wn = malloc(sizeof(struct acx_node), M_DEVBUF, M_NOWAIT);
+	wn = malloc(sizeof(*wn), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (wn == NULL)
 		return (NULL);
 
-	bzero(wn, sizeof(struct acx_node));
-
 	return ((struct ieee80211_node *)wn);
 }
 
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 1ca938460ad..b60b488db97 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.67 2007/09/18 00:46:41 krw Exp $  */
+/*      $OpenBSD: ath.c,v 1.68 2007/10/01 04:03:51 krw Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -1727,11 +1727,11 @@ ath_desc_free(struct ath_softc *sc)
 struct ieee80211_node *
 ath_node_alloc(struct ieee80211com *ic)
 {
-	struct ath_node *an =
-		malloc(sizeof(struct ath_node), M_DEVBUF, M_NOWAIT);
+	struct ath_node *an;
+	
+	an = malloc(sizeof(*an), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (an) {
 		int i;
-		bzero(an, sizeof(struct ath_node));
 		for (i = 0; i < ATH_RHIST_SIZE; i++)
 			an->an_rx_hist[i].arh_ticks = ATH_RHIST_NOTIME;
 		an->an_rx_hist_next = ATH_RHIST_SIZE-1;
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 665e22ceeb8..8082117d466 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.23 2006/11/28 23:59:45 dlg Exp $	*/
+/*	$OpenBSD: cac.c,v 1.24 2007/10/01 04:03:51 krw Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -225,13 +225,12 @@ cac_init(struct cac_softc *sc, int startfw)
 
 	sc->sc_nunits = cinfo.num_drvs;
 	sc->sc_dinfos = malloc(cinfo.num_drvs * sizeof(struct cac_drive_info),
-	    M_DEVBUF, M_NOWAIT);
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sc->sc_dinfos == NULL) {
 		printf("%s: cannot allocate memory for drive_info\n",
 		    sc->sc_dv.dv_xname);
 		return (-1);
 	}
-	bzero(sc->sc_dinfos, cinfo.num_drvs * sizeof(struct cac_drive_info));
 
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter = &cac_switch;
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 399d7f157e3..a297da047ce 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.97 2007/05/08 00:04:47 deraadt Exp $	*/
+/*	$OpenBSD: dc.c,v 1.98 2007/10/01 04:03:51 krw Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1475,10 +1475,9 @@ dc_decode_leaf_sia(sc, l)
 {
 	struct dc_mediainfo *m;
 
-	m = malloc(sizeof(struct dc_mediainfo), M_DEVBUF, M_NOWAIT);
+	m = malloc(sizeof(*m), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (m == NULL)
 		return;
-	bzero(m, sizeof(struct dc_mediainfo));
 	switch (l->dc_sia_code & ~DC_SIA_CODE_EXT) {
 	case DC_SIA_CODE_10BT:
 		m->dc_media = IFM_10_T;
@@ -1524,10 +1523,9 @@ dc_decode_leaf_sym(sc, l)
 {
 	struct dc_mediainfo *m;
 
-	m = malloc(sizeof(struct dc_mediainfo), M_DEVBUF, M_NOWAIT);
+	m = malloc(sizeof(*m), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (m == NULL)
 		return;
-	bzero(m, sizeof(struct dc_mediainfo));
 	if (l->dc_sym_code == DC_SYM_CODE_100BT)
 		m->dc_media = IFM_100_TX;
 
@@ -1551,10 +1549,9 @@ dc_decode_leaf_mii(sc, l)
 	u_int8_t *p;
 	struct dc_mediainfo *m;
 
-	m = malloc(sizeof(struct dc_mediainfo), M_DEVBUF, M_NOWAIT);
+	m = malloc(sizeof(*m), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (m == NULL)
 		return;
-	bzero(m, sizeof(struct dc_mediainfo));
 	/* We abuse IFM_AUTO to represent MII. */
 	m->dc_media = IFM_AUTO;
 	m->dc_gp_len = l->dc_gpr_len;
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index 147d05fb719..8e0eb1484e6 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_common.c,v 1.39 2007/04/28 00:35:16 deraadt Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.40 2007/10/01 04:03:51 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist.  All rights reserved.
@@ -491,10 +491,9 @@ gdt_attach(gdt)
 	config_found(&gdt->sc_dev, &saa, scsiprint);
 
 	gdt->sc_raw_link = malloc(gdt->sc_bus_cnt * sizeof (struct scsi_link),
-				  M_DEVBUF, M_NOWAIT);
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (gdt->sc_raw_link == NULL)
 		panic("gdt_attach");
-	bzero(gdt->sc_raw_link, gdt->sc_bus_cnt * sizeof (struct scsi_link));
 
 	for (i = 0; i < gdt->sc_bus_cnt; i++) {
 		/* Fill in the prototype scsi_link. */
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 6a4ce957da0..72a07f79e1f 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.79 2007/08/28 18:34:38 deraadt Exp $ */
+/*	$OpenBSD: malo.c,v 1.80 2007/10/01 04:03:51 krw Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -1176,12 +1176,10 @@ malo_node_alloc(struct ieee80211com *ic)
 {
 	struct malo_node *wn;
 
-	wn = malloc(sizeof(struct malo_node), M_DEVBUF, M_NOWAIT);
+	wn = malloc(sizeof(*wn), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (wn == NULL)
 		return (NULL);
 
-	bzero(wn, sizeof(struct malo_node));
-
 	return ((struct ieee80211_node *)wn);
 }
 
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index 4c6928e17cc..9b400aa49c3 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oosiop.c,v 1.5 2006/11/28 23:59:45 dlg Exp $	*/
+/*	$OpenBSD: oosiop.c,v 1.6 2007/10/01 04:03:51 krw Exp $	*/
 /*	$NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $	*/
 
 /*
@@ -270,12 +270,11 @@ oosiop_alloc_cb(struct oosiop_softc *sc, int ncb)
 	/*
 	 * Allocate oosiop_cb.
 	 */
-	cb = malloc(sizeof(struct oosiop_cb) * ncb, M_DEVBUF, M_NOWAIT);
+	cb = malloc(sizeof(*cb) * ncb, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cb == NULL) {
 		printf(": failed to allocate cb memory\n");
 		return (ENOMEM);
 	}
-	bzero(cb, sizeof(struct oosiop_cb) * ncb);
 
 	/*
 	 * Allocate DMA-safe memory for the oosiop_xfer and map it.
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index eb526a7cab1..a32e69479c1 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop.c,v 1.29 2007/06/20 18:02:39 miod Exp $	*/
+/*	$OpenBSD: osiop.c,v 1.30 2007/10/01 04:03:51 krw Exp $	*/
 /*	$NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $	*/
 
 /*
@@ -277,13 +277,11 @@ osiop_attach(sc)
 	/*
 	 * Allocate (malloc) memory for acb's.
 	 */
-	acb = malloc(sizeof(struct osiop_acb) * OSIOP_NACB,
-	    M_DEVBUF, M_NOWAIT);
+	acb = malloc(sizeof(*acb) * OSIOP_NACB, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (acb == NULL) {
 		printf(": can't allocate memory for acb\n");
 		return;
 	}
-	bzero(acb, sizeof(struct osiop_acb) * OSIOP_NACB);
 	sc->sc_acb = acb;
 
 	sc->sc_cfflags = sc->sc_dev.dv_cfdata->cf_flags;
diff --git a/sys/dev/ic/sili.c b/sys/dev/ic/sili.c
index ea4c15ff37b..78bb5491897 100644
--- a/sys/dev/ic/sili.c
+++ b/sys/dev/ic/sili.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sili.c,v 1.33 2007/04/22 00:06:51 dlg Exp $ */
+/*	$OpenBSD: sili.c,v 1.34 2007/10/01 04:03:51 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -402,8 +402,7 @@ sili_ports_alloc(struct sili_softc *sc)
 	int				i;
 
 	sc->sc_ports = malloc(sizeof(struct sili_port) * sc->sc_nports,
-	    M_DEVBUF, M_WAITOK);
-	bzero(sc->sc_ports, sizeof(struct sili_port) * sc->sc_nports);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	for (i = 0; i < sc->sc_nports; i++) {
 		sp = &sc->sc_ports[i];
@@ -556,8 +555,7 @@ sili_dmamem_alloc(struct sili_softc *sc, bus_size_t size, bus_size_t align)
 	struct sili_dmamem		*sdm;
 	int				nsegs;
 
-	sdm = malloc(sizeof(struct sili_dmamem), M_DEVBUF, M_WAITOK);
-	bzero(sdm, sizeof(struct sili_dmamem));
+	sdm = malloc(sizeof(*sdm), M_DEVBUF, M_WAITOK | M_ZERO);
 	sdm->sdm_size = size;
 
 	if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 2f6787b7ba9..1dfc7169ef7 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti.c,v 1.55 2007/06/17 13:59:08 miod Exp $	*/
+/*	$OpenBSD: sti.c,v 1.56 2007/10/01 04:03:51 krw Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -132,13 +132,12 @@ sti_attach_common(sc, codebase)
 	struct sti_screen *scr;
 	int rc;
 
-	scr = malloc(sizeof(struct sti_screen), M_DEVBUF, M_NOWAIT);
+	scr = malloc(sizeof(*scr), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (scr == NULL) {
 		printf("cannot allocate screen data\n");
 		return (ENOMEM);
 	}
 
-	bzero(scr, sizeof(struct sti_screen));
 	sc->sc_scr = scr;
 	scr->scr_main = sc;
 
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 001c8b87ed7..e7458f9456d 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.45 2007/02/11 20:29:22 miod Exp $ */
+/* $OpenBSD: vga.c,v 1.46 2007/10/01 04:03:51 krw Exp $ */
 /* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */
 
 /*
@@ -529,10 +529,9 @@ vga_extended_attach(self, iot, memt, type, map)
 		vc = &vga_console_vc;
 		vga_console_attached = 1;
 	} else {
-		vc = malloc(sizeof(struct vga_config), M_DEVBUF, M_NOWAIT);
+		vc = malloc(sizeof(*vc), M_DEVBUF, M_NOWAIT | M_ZERO);
 		if (vc == NULL)
 			return;
-		bzero(vc, sizeof(struct vga_config));
 		vga_init(vc, iot, memt);
 	}
 
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 692979dd260..f6e264c4251 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdc.c,v 1.96 2007/05/08 16:07:03 deraadt Exp $     */
+/*      $OpenBSD: wdc.c,v 1.97 2007/10/01 04:03:51 krw Exp $     */
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
 
 
@@ -2119,8 +2119,7 @@ wdc_ioctl_get()
 	struct wdc_ioctl *wi;
 	int s;
 
-	wi = malloc(sizeof(struct wdc_ioctl), M_TEMP, M_WAITOK);
-	bzero(wi, sizeof (struct wdc_ioctl));
+	wi = malloc(sizeof(*wi), M_TEMP, M_WAITOK | M_ZERO);
 	s = splbio();
 	LIST_INSERT_HEAD(&wi_head, wi, wi_list);
 	splx(s);