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

obvious.

17 files changed, 57 insertions, 112 deletions

diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index 06386d868c5..19ce9058fcf 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.41 2007/04/22 05:11:45 dlg Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.42 2007/10/01 15:34:48 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -99,8 +99,7 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa)
 	struct atascsi			*as;
 	int				i;
 
-	as = malloc(sizeof(struct atascsi), M_DEVBUF, M_WAITOK);
-	bzero(as, sizeof(struct atascsi));
+	as = malloc(sizeof(*as), M_DEVBUF, M_WAITOK | M_ZERO);
 
 	as->as_dev = self;
 	as->as_cookie = aaa->aaa_cookie;
@@ -123,8 +122,7 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa)
 		as->as_link.openings--;
 
 	as->as_ports = malloc(sizeof(struct ata_port *) * aaa->aaa_nports,
-	    M_DEVBUF, M_WAITOK);
-	bzero(as->as_ports, sizeof(struct ata_port *) * aaa->aaa_nports);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	/* fill in the port array with the type of devices there */
 	for (i = 0; i < as->as_link.adapter_buswidth; i++)
@@ -168,8 +166,7 @@ atascsi_probe(struct atascsi *as, int port)
 		return (ENODEV);
 	}
 
-	ap = malloc(sizeof(struct ata_port), M_DEVBUF, M_WAITOK);
-	bzero(ap, sizeof(struct ata_port));
+	ap = malloc(sizeof(*ap), M_DEVBUF, M_WAITOK | M_ZERO);
 	ap->ap_as = as;
 	ap->ap_port = port;
 	ap->ap_type = type;
@@ -211,7 +208,8 @@ ata_setup_identify(struct ata_port *ap, int nosleep)
 	if (xa == NULL)
 		return (NULL);
 
-	xa->data = malloc(512, M_TEMP, nosleep ? M_NOWAIT : M_WAITOK);
+	xa->data = malloc(512, M_TEMP, nosleep ? (M_NOWAIT | M_ZERO) :
+	    (M_WAITOK | M_ZERO));
 	if (xa->data == NULL) {
 		s = splbio();
 		xa->state = ATA_S_ERROR;
@@ -219,7 +217,6 @@ ata_setup_identify(struct ata_port *ap, int nosleep)
 		splx(s);
 		return (NULL);
 	}
-	bzero(xa->data, 512);
 	xa->datalen = 512;
 
 	xa->fis->flags = ATA_H2D_FLAGS_CMD;
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 081819dbdca..3834abd5e89 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.67 2007/06/20 18:15:46 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.68 2007/10/01 15:34:48 krw Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -1058,11 +1058,10 @@ fdformat(dev, finfo, p)
 	int fd_bsize = FD_BSIZE(fd);
 
         /* set up a buffer header for fdstrategy() */
-        bp = (struct buf *)malloc(sizeof(struct buf), M_TEMP, M_NOWAIT);
+        bp = malloc(sizeof(*bp), M_TEMP, M_NOWAIT | M_ZERO);
         if (bp == NULL)
                 return ENOBUFS;
 
-        bzero((void *)bp, sizeof(struct buf));
         bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
         bp->b_proc = p;
         bp->b_dev = dev;
diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c
index 63488aab9fb..dd3d9e20b67 100644
--- a/sys/dev/isa/pckbc_isa.c
+++ b/sys/dev/isa/pckbc_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pckbc_isa.c,v 1.4 2004/04/02 04:39:51 deraadt Exp $	*/
+/*	$OpenBSD: pckbc_isa.c,v 1.5 2007/10/01 15:34:48 krw Exp $	*/
 /*	$NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp $	*/
 
 /*
@@ -148,8 +148,7 @@ pckbc_isa_attach(parent, self, aux)
 		    bus_space_map(iot, IO_KBD + KBCMDP, 1, 0, &ioh_c))
 			panic("pckbc_attach: couldn't map");
 
-		t = malloc(sizeof(struct pckbc_internal), M_DEVBUF, M_WAITOK);
-		bzero(t, sizeof(struct pckbc_internal));
+		t = malloc(sizeof(*t), M_DEVBUF, M_WAITOK | M_ZERO);
 		t->t_iot = iot;
 		t->t_ioh_d = ioh_d;
 		t->t_ioh_c = ioh_c;
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 0804e054dd0..a81066e098f 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: seagate.c,v 1.21 2007/06/29 15:17:02 jasper Exp $	*/
+/*	$OpenBSD: seagate.c,v 1.22 2007/10/01 15:34:48 krw Exp $	*/
 
 /*
  * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -624,10 +624,8 @@ sea_get_scb(struct sea_softc *sea, int flags)
 			break;
 		}
 		if (sea->numscbs < SEA_SCB_MAX) {
-			scb = (struct sea_scb *) malloc(sizeof(struct sea_scb),
-			    M_TEMP, M_NOWAIT);
+			scb = malloc(sizeof(*scb), M_TEMP, M_NOWAIT | M_ZERO);
 			if (scb) {
-				bzero(scb, sizeof(struct sea_scb));
 				sea->numscbs++;
 			} else
 				printf("%s: can't malloc scb\n",
diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c
index 2c0236e1287..51f36a94418 100644
--- a/sys/dev/pci/ahci.c
+++ b/sys/dev/pci/ahci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahci.c,v 1.128 2007/07/03 22:33:20 dlg Exp $ */
+/*	$OpenBSD: ahci.c,v 1.129 2007/10/01 15:34:48 krw Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -824,13 +824,12 @@ ahci_port_alloc(struct ahci_softc *sc, u_int port)
 	struct ahci_cmd_table		*table;
 	int				i, rc = ENOMEM;
 
-	ap = malloc(sizeof(struct ahci_port), M_DEVBUF, M_NOWAIT);
+	ap = malloc(sizeof(*ap), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (ap == NULL) {
 		printf("%s: unable to allocate memory for port %d\n",
 		    DEVNAME(sc), port);
 		goto reterr;
 	}
-	bzero(ap, sizeof(struct ahci_port));
 
 #ifdef AHCI_DEBUG
 	snprintf(ap->ap_name, sizeof(ap->ap_name), "%s.%d",
@@ -899,13 +898,12 @@ ahci_port_alloc(struct ahci_softc *sc, u_int port)
 
 	/* Allocate a CCB for each command slot */
 	ap->ap_ccbs = malloc(sizeof(struct ahci_ccb) * sc->sc_ncmds, M_DEVBUF,
-	    M_NOWAIT);
+	    M_NOWAIT | M_ZERO);
 	if (ap->ap_ccbs == NULL) {
 		printf("%s: unable to allocate command list for port %d\n",
 		    DEVNAME(sc), port);
 		goto freeport;
 	}
-	bzero(ap->ap_ccbs, sizeof(struct ahci_ccb) * sc->sc_ncmds);
 
 	/* Command List Structures and Command Tables */
 	ap->ap_dmamem_cmd_list = ahci_dmamem_alloc(sc,
@@ -2030,11 +2028,10 @@ ahci_dmamem_alloc(struct ahci_softc *sc, size_t size)
 	struct ahci_dmamem		*adm;
 	int				nsegs;
 
-	adm = malloc(sizeof(struct ahci_dmamem), M_DEVBUF, M_NOWAIT);
+	adm = malloc(sizeof(*adm), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (adm == NULL)
 		return (NULL);
 
-	bzero(adm, sizeof(struct ahci_dmamem));
 	adm->adm_size = size;
 
 	if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c
index f1fe403d55e..7369094d1b7 100644
--- a/sys/dev/pci/arc.c
+++ b/sys/dev/pci/arc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc.c,v 1.65 2007/07/11 19:01:30 otto Exp $ */
+/*	$OpenBSD: arc.c,v 1.66 2007/10/01 15:34:48 krw Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -1550,8 +1550,7 @@ arc_create_sensors(void *xsc, void *arg)
 	sc->sc_nsensors = bi.bi_novol;
 
 	sc->sc_sensors = malloc(sizeof(struct ksensor) * sc->sc_nsensors,
-	    M_DEVBUF, M_WAITOK);
-	bzero(sc->sc_sensors, sizeof(struct ksensor) * sc->sc_nsensors);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	strlcpy(sc->sc_sensordev.xname, DEVNAME(sc),
 	    sizeof(sc->sc_sensordev.xname));
@@ -1724,11 +1723,10 @@ arc_dmamem_alloc(struct arc_softc *sc, size_t size)
 	struct arc_dmamem		*adm;
 	int				nsegs;
 
-	adm = malloc(sizeof(struct arc_dmamem), M_DEVBUF, M_NOWAIT);
+	adm = malloc(sizeof(*adm), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (adm == NULL)
 		return (NULL);
 
-	bzero(adm, sizeof(struct arc_dmamem));
 	adm->adm_size = size;
 
 	if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
@@ -1783,8 +1781,7 @@ arc_alloc_ccbs(struct arc_softc *sc)
 	TAILQ_INIT(&sc->sc_ccb_free);
 
 	sc->sc_ccbs = malloc(sizeof(struct arc_ccb) * sc->sc_req_count,
-	    M_DEVBUF, M_WAITOK);
-	bzero(sc->sc_ccbs, sizeof(struct arc_ccb) * sc->sc_req_count);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	sc->sc_requests = arc_dmamem_alloc(sc,
 	    ARC_MAX_IOCMDLEN * sc->sc_req_count);
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index a2c48ba6997..a53bc113a88 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751.c,v 1.153 2007/09/18 22:02:18 djm Exp $	*/
+/*	$OpenBSD: hifn7751.c,v 1.154 2007/10/01 15:34:48 krw Exp $	*/
 
 /*
  * Invertex AEON / Hifn 7751 driver
@@ -1958,13 +1958,11 @@ hifn_process(struct cryptop *crp)
 		goto errout;
 	}
 
-	cmd = (struct hifn_command *)malloc(sizeof(struct hifn_command),
-	    M_DEVBUF, M_NOWAIT);
+	cmd = malloc(sizeof(*cmd), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cmd == NULL) {
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(cmd, sizeof(struct hifn_command));
 
 	if (crp->crp_flags & CRYPTO_F_IMBUF) {
 		cmd->srcu.src_m = (struct mbuf *)crp->crp_buf;
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 21889c0f8eb..48d8e9e1171 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em.c,v 1.172 2007/05/31 01:04:57 henning Exp $ */
+/* $OpenBSD: if_em.c,v 1.173 2007/10/01 15:34:48 krw Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -1841,18 +1841,13 @@ em_dma_free(struct em_softc *sc, struct em_dma_alloc *dma)
 int
 em_allocate_transmit_structures(struct em_softc *sc)
 {
-	if (!(sc->tx_buffer_area =
-	      (struct em_buffer *) malloc(sizeof(struct em_buffer) *
-					     sc->num_tx_desc, M_DEVBUF,
-					     M_NOWAIT))) {
+	if (!(sc->tx_buffer_area = malloc(sizeof(struct em_buffer) *
+	    sc->num_tx_desc, M_DEVBUF, M_NOWAIT | M_ZERO))) {
 		printf("%s: Unable to allocate tx_buffer memory\n", 
 		       sc->sc_dv.dv_xname);
 		return (ENOMEM);
 	}
 
-	bzero(sc->tx_buffer_area,
-	      sizeof(struct em_buffer) * sc->num_tx_desc);
-
 	return (0);
 }
 
@@ -2279,18 +2274,13 @@ em_allocate_receive_structures(struct em_softc *sc)
 	int		i, error;
 	struct em_buffer *rx_buffer;
 
-	if (!(sc->rx_buffer_area =
-	      (struct em_buffer *) malloc(sizeof(struct em_buffer) *
-					     sc->num_rx_desc, M_DEVBUF,
-					     M_NOWAIT))) {
+	if (!(sc->rx_buffer_area = malloc(sizeof(struct em_buffer) *
+	    sc->num_rx_desc, M_DEVBUF, M_NOWAIT | M_ZERO))) {
 		printf("%s: Unable to allocate rx_buffer memory\n", 
 		       sc->sc_dv.dv_xname);
 		return (ENOMEM);
 	}
 
-	bzero(sc->rx_buffer_area,
-	      sizeof(struct em_buffer) * sc->num_rx_desc);
-
 	sc->rxtag = sc->osdep.em_pa.pa_dmat;
 
 	error = bus_dmamap_create(sc->rxtag, MCLBYTES, 1, MCLBYTES,
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index c8a1b62a53e..e0e16d729ca 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.c,v 1.37 2007/09/19 03:50:24 brad Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.38 2007/10/01 15:34:48 krw Exp $ */
 
 #include <dev/pci/if_ixgb.h>
 
@@ -1154,16 +1154,12 @@ ixgb_dma_free(struct ixgb_softc *sc, struct ixgb_dma_alloc *dma)
 int
 ixgb_allocate_transmit_structures(struct ixgb_softc *sc)
 {
-	if (!(sc->tx_buffer_area =
-	      (struct ixgb_buffer *) malloc(sizeof(struct ixgb_buffer) *
-					    sc->num_tx_desc, M_DEVBUF,
-					    M_NOWAIT))) {
+	if (!(sc->tx_buffer_area = malloc(sizeof(struct ixgb_buffer) *
+	    sc->num_tx_desc, M_DEVBUF, M_NOWAIT | M_ZERO))) {
 		printf("%s: Unable to allocate tx_buffer memory\n",
 		       sc->sc_dv.dv_xname);
 		return (ENOMEM);
 	}
-	bzero(sc->tx_buffer_area,
-	      sizeof(struct ixgb_buffer) * sc->num_tx_desc);
 
 	return (0);
 }
@@ -1525,18 +1521,13 @@ ixgb_allocate_receive_structures(struct ixgb_softc *sc)
 	int             i, error;
 	struct ixgb_buffer *rx_buffer;
 
-	if (!(sc->rx_buffer_area =
-	      (struct ixgb_buffer *) malloc(sizeof(struct ixgb_buffer) *
-					    sc->num_rx_desc, M_DEVBUF,
-					    M_NOWAIT))) {
+	if (!(sc->rx_buffer_area = malloc(sizeof(struct ixgb_buffer) *
+	    sc->num_rx_desc, M_DEVBUF, M_NOWAIT | M_ZERO))) {
 		printf("%s: Unable to allocate rx_buffer memory\n",
 		       sc->sc_dv.dv_xname);
 		return (ENOMEM);
 	}
 
-	bzero(sc->rx_buffer_area,
-	      sizeof(struct ixgb_buffer) * sc->num_rx_desc);
-
 	sc->rxtag = sc->osdep.ixgb_pa.pa_dmat;
 
 	rx_buffer = sc->rx_buffer_area;
diff --git a/sys/dev/pci/if_nxe.c b/sys/dev/pci/if_nxe.c
index eed13c005cb..1e468c21fd1 100644
--- a/sys/dev/pci/if_nxe.c
+++ b/sys/dev/pci/if_nxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nxe.c,v 1.51 2007/08/27 01:11:11 dlg Exp $ */
+/*	$OpenBSD: if_nxe.c,v 1.52 2007/10/01 15:34:48 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -1932,11 +1932,8 @@ nxe_pkt_alloc(struct nxe_softc *sc, u_int npkts, int nsegs)
 	struct nxe_pkt			*pkt;
 	int				i;
 
-	npl = malloc(sizeof(struct nxe_pkt_list), M_DEVBUF, M_WAITOK);
-	bzero(npl, sizeof(struct nxe_pkt_list));
-
-	pkt = malloc(sizeof(struct nxe_pkt) * npkts, M_DEVBUF, M_WAITOK);
-	bzero(pkt, sizeof(struct nxe_pkt) * npkts);
+	npl = malloc(sizeof(*npl), M_DEVBUF, M_WAITOK | M_ZERO);
+	pkt = malloc(sizeof(*pkt) * npkts, M_DEVBUF, M_WAITOK | M_ZERO);
 
 	npl->npl_pkts = pkt;
 	TAILQ_INIT(&npl->npl_free);
@@ -2004,8 +2001,7 @@ nxe_dmamem_alloc(struct nxe_softc *sc, bus_size_t size, bus_size_t align)
 	struct nxe_dmamem		*ndm;
 	int				nsegs;
 
-	ndm = malloc(sizeof(struct nxe_dmamem), M_DEVBUF, M_WAITOK);
-	bzero(ndm, sizeof(struct nxe_dmamem));
+	ndm = malloc(sizeof(*ndm), M_DEVBUF, M_WAITOK | M_ZERO);
 	ndm->ndm_size = size;
 
 	if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
diff --git a/sys/dev/pci/if_san_common.c b/sys/dev/pci/if_san_common.c
index 6fc69e2d1ff..eebfdbfb176 100644
--- a/sys/dev/pci/if_san_common.c
+++ b/sys/dev/pci/if_san_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_san_common.c,v 1.11 2005/11/08 20:23:42 canacar Exp $	*/
+/*	$OpenBSD: if_san_common.c,v 1.12 2007/10/01 15:34:48 krw Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -144,13 +144,12 @@ san_dev_attach(void *hw, u_int8_t *devname, int namelen)
 	wanpipe_common_t	*common = NULL;
 	int			err = 0;
 
-	card=malloc(sizeof(sdla_t), M_DEVBUF, M_NOWAIT);
+	card = malloc(sizeof(*card), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (!card) {
 		log(LOG_INFO, "%s: Failed allocate new card!\n",
 				san_drvname);
 		return (EINVAL);
 	}
-	bzero(card, sizeof(sdla_t));
 	card->magic = WANPIPE_MAGIC;
 	wanpipe_generic_name(card, card->devname, sizeof(card->devname));
 	strlcpy(devname, card->devname, namelen);
diff --git a/sys/dev/pci/if_sandrv.c b/sys/dev/pci/if_sandrv.c
index b0687a6aa24..2782022a93e 100644
--- a/sys/dev/pci/if_sandrv.c
+++ b/sys/dev/pci/if_sandrv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sandrv.c,v 1.11 2006/04/20 20:31:12 miod Exp $	*/
+/*	$OpenBSD: if_sandrv.c,v 1.12 2007/10/01 15:34:48 krw Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -396,12 +396,10 @@ sdla_save_hw_probe(sdlahw_t *hw, int port)
 {
 	sdla_hw_probe_t *tmp_hw_probe;
 
-	tmp_hw_probe = malloc(sizeof(sdla_hw_probe_t), M_DEVBUF, M_NOWAIT);
+	tmp_hw_probe = malloc(sizeof(*tmp_hw_probe), M_DEVBUF, M_NOWAIT|M_ZERO);
 	if (tmp_hw_probe == NULL)
 		return;
 
-	bzero(tmp_hw_probe, sizeof(sdla_hw_probe_t));
-
 	snprintf(tmp_hw_probe->hw_info, sizeof(tmp_hw_probe->hw_info),
 		"%s : SLOT=%d : BUS=%d : IRQ=%d : CPU=%c : PORT=%s",
 		SDLA_ADPTR_DECODE(hw->hwcard->atype), hw->hwcard->slot_no,
@@ -581,12 +579,10 @@ sdla_card_register(u_int16_t atype, int slot_no, int bus_no)
 	if (new_hwcard)
 		return (new_hwcard);
 
-	new_hwcard = malloc(sizeof(sdlahw_card_t), M_DEVBUF, M_NOWAIT);
+	new_hwcard = malloc(sizeof(*new_hwcard), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (!new_hwcard)
 		return (NULL);
 
-	bzero(new_hwcard, sizeof(sdlahw_card_t));
-
 	new_hwcard->atype	= atype;
 	new_hwcard->slot_no	= slot_no;
 	new_hwcard->bus_no	= bus_no;
@@ -667,12 +663,10 @@ sdla_hw_register(sdlahw_card_t *card, int cpu_no, int irq, void *dev)
 	if (new_hw)
 		return (new_hw);
 
-	new_hw = malloc(sizeof(sdlahw_t), M_DEVBUF, M_NOWAIT);
+	new_hw = malloc(sizeof(*new_hw), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (!new_hw)
 		return (NULL);
 
-	bzero(new_hw, sizeof(sdlahw_t));
-
 	new_hw->cpu_no	= cpu_no;
 	new_hw->irq	= irq;
 	new_hw->hwcard	= card;
diff --git a/sys/dev/pci/ises.c b/sys/dev/pci/ises.c
index 0f06a70c6f8..83e2bb3f669 100644
--- a/sys/dev/pci/ises.c
+++ b/sys/dev/pci/ises.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ises.c,v 1.32 2007/09/18 22:02:18 djm Exp $	*/
+/*	$OpenBSD: ises.c,v 1.33 2007/10/01 15:34:48 krw Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se)
@@ -540,14 +540,12 @@ ises_queue_cmd(struct ises_softc *sc, u_int32_t cmd, u_int32_t *data,
 		return (EAGAIN); /* XXX ENOMEM ? */
 	}
 
-	cq = (struct ises_cmd *) 
-	    malloc(sizeof (struct ises_cmd), M_DEVBUF, M_NOWAIT);
+	cq = malloc(sizeof(*cq), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cq == NULL) {
 		splx(s);
 		isesstats.nomem++;
 		return (ENOMEM);
 	}
-	bzero(cq, sizeof (struct ises_cmd));
 	cq->cmd_code = code;
 	cq->cmd_cb = callback;
 	cq->cmd_session = sc->sc_cursession;
@@ -1171,10 +1169,9 @@ ises_process(struct cryptop *crp)
 	}
 	splx(s);
 
-	q = (struct ises_q *)malloc(sizeof(struct ises_q), M_DEVBUF, M_NOWAIT);
+	q = malloc(sizeof(*q), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (q == NULL)
 		goto memerr;
-	bzero(q, sizeof(struct ises_q));
 
 	q->q_sesn = ISES_SESSION(crp->crp_sid);
 	ses = &sc->sc_sessions[q->q_sesn];
diff --git a/sys/dev/pci/musycc.c b/sys/dev/pci/musycc.c
index 38939ec2aa1..bdc8c0aa83d 100644
--- a/sys/dev/pci/musycc.c
+++ b/sys/dev/pci/musycc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: musycc.c,v 1.16 2007/09/18 00:46:41 krw Exp $ */
+/*	$OpenBSD: musycc.c,v 1.17 2007/10/01 15:34:48 krw Exp $ */
 
 /*
  * Copyright (c) 2004,2005  Internet Business Solutions AG, Zurich, Switzerland
@@ -116,15 +116,14 @@ musycc_attach_common(struct musycc_softc *sc, u_int32_t portmap, u_int32_t mode)
 	    MUSYCC_CONF_BLAPSE_SET(3) | MUSYCC_CONF_INTB;
 
 	/* initialize group descriptors */
-	sc->mc_groups = (struct musycc_group *)malloc(sc->mc_ngroups *
-	    sizeof(struct musycc_group), M_DEVBUF, M_NOWAIT);
+	sc->mc_groups = malloc(sc->mc_ngroups * sizeof(struct musycc_group),
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sc->mc_groups == NULL) {
 		printf(": couldn't alloc group descriptors\n");
 		musycc_free_groupdesc(sc);
 		musycc_free_intqueue(sc);
 		return (-1);
 	}
-	bzero(sc->mc_groups, sc->mc_ngroups * sizeof(struct musycc_group));
 
 	for (i = 0; i < sc->mc_ngroups; i++) {
 		mg = &sc->mc_groups[i];
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 1b9197ebf19..ed8dcccb432 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tga.c,v 1.29 2006/12/17 22:18:16 miod Exp $ */
+/* $OpenBSD: tga.c,v 1.30 2007/10/01 15:34:48 krw Exp $ */
 /* $NetBSD: tga.c,v 1.40 2002/03/13 15:05:18 ad Exp $ */
 
 /*
@@ -428,11 +428,10 @@ tgaattach(parent, self, aux)
 		sc->sc_dc = &tga_console_dc;
 		sc->nscreens = 1;
 	} else {
-		sc->sc_dc = (struct tga_devconfig *)
-		    malloc(sizeof(struct tga_devconfig), M_DEVBUF, M_NOWAIT);
+		sc->sc_dc = malloc(sizeof(struct tga_devconfig), M_DEVBUF,
+		    M_NOWAIT | M_ZERO);
 		if (sc->sc_dc == NULL)
 			return;
-		bzero(sc->sc_dc, sizeof(struct tga_devconfig));
 		tga_getdevconfig(pa->pa_memt, pa->pa_pc, pa->pa_tag,
 		    sc->sc_dc);
 	}
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index f2103655045..f0716d8dd32 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsec.c,v 1.139 2007/09/18 22:02:18 djm Exp $	*/
+/*	$OpenBSD: ubsec.c,v 1.140 2007/10/01 15:34:48 krw Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -1805,12 +1805,11 @@ ubsec_kprocess_modexp_sw(struct ubsec_softc *sc, struct cryptkop *krp)
 	int err = 0, s;
 	u_int nbits, normbits, mbits, shiftbits, ebits;
 
-	me = (struct ubsec_q2_modexp *)malloc(sizeof *me, M_DEVBUF, M_NOWAIT);
+	me = malloc(sizeof *me, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (me == NULL) {
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me, sizeof *me);
 	me->me_krp = krp;
 	me->me_q.q_type = UBS_CTXOP_MODEXP;
 
@@ -2004,12 +2003,11 @@ ubsec_kprocess_modexp_hw(struct ubsec_softc *sc, struct cryptkop *krp)
 	int err = 0, s;
 	u_int nbits, normbits, mbits, shiftbits, ebits;
 
-	me = (struct ubsec_q2_modexp *)malloc(sizeof *me, M_DEVBUF, M_NOWAIT);
+	me = malloc(sizeof *me, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (me == NULL) {
 		err = ENOMEM;
 		goto errout;
 	}
-	bzero(me, sizeof *me);
 	me->me_krp = krp;
 	me->me_q.q_type = UBS_CTXOP_MODEXP;
 
@@ -2234,10 +2232,9 @@ ubsec_kprocess_rsapriv(struct ubsec_softc *sc, struct cryptkop *krp)
 		goto errout;
 	}
 
-	rp = (struct ubsec_q2_rsapriv *)malloc(sizeof *rp, M_DEVBUF, M_NOWAIT);
+	rp = malloc(sizeof *rp, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (rp == NULL)
 		return (ENOMEM);
-	bzero(rp, sizeof *rp);
 	rp->rpr_krp = krp;
 	rp->rpr_q.q_type = UBS_CTXOP_RSAPRIV;
 
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c
index 78ebdf4009e..23cfe6d6954 100644
--- a/sys/dev/sdmmc/sdhc.c
+++ b/sys/dev/sdmmc/sdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdhc.c,v 1.23 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: sdhc.c,v 1.24 2007/10/01 15:34:48 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -155,12 +155,10 @@ sdhc_host_found(struct sdhc_softc *sc, bus_space_tag_t iot,
 
 	/* Allocate one more host structure. */
 	sc->sc_nhosts++;
-	hp = (struct sdhc_host *)malloc(sizeof(struct sdhc_host),
-	    M_DEVBUF, M_WAITOK);
+	hp = malloc(sizeof(*hp), M_DEVBUF, M_WAITOK | M_ZERO);
 	sc->sc_host[sc->sc_nhosts - 1] = hp;
 
 	/* Fill in the new host structure. */
-	bzero(hp, sizeof(struct sdhc_host));
 	hp->sc = sc;
 	hp->iot = iot;
 	hp->ioh = ioh;