KNF

prompted and "much better" by marco@, ok pyr@

29 files changed, 87 insertions, 84 deletions

diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 413a406f8c6..8e01b5533a7 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.80 2007/09/08 17:59:23 gilles Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.81 2007/09/11 13:39:33 gilles Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -239,9 +239,9 @@ ccdattach(int num)
 	}
 
 	ccd_softc = (struct ccd_softc *)malloc(num * sizeof(struct ccd_softc),
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	ccddevs = (struct ccddevice *)malloc(num * sizeof(struct ccddevice),
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if ((ccd_softc == NULL) || (ccddevs == NULL)) {
 		printf("WARNING: no memory for concatenated disks\n");
 		if (ccd_softc != NULL)
@@ -290,7 +290,7 @@ ccdinit(struct ccddevice *ccd, char **cpaths, struct proc *p)
 
 	/* Allocate space for the component info. */
 	cs->sc_cinfo = malloc(cs->sc_nccdisks * sizeof(struct ccdcinfo),
-	    M_DEVBUF, M_WAITOK|M_ZERO);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	/*
 	 * Verify that each component piece exists and record
@@ -476,7 +476,8 @@ ccdinterleave(struct ccd_softc *cs)
 	 * Chances are this is too big, but we don't care.
 	 */
 	size = (cs->sc_nccdisks + 1) * sizeof(struct ccdiinfo);
-	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_DEVBUF, M_WAITOK|M_ZERO);
+	cs->sc_itable = (struct ccdiinfo *)malloc(size, M_DEVBUF,
+	    M_WAITOK | M_ZERO);
 
 	/*
 	 * Trivial case: no interleave (actually interleave of disk size).
@@ -724,7 +725,7 @@ ccdstart(struct ccd_softc *cs, struct buf *bp)
 	 * Allocate component buffers
 	 */
 	cbpp = malloc(2 * cs->sc_nccdisks * sizeof(struct ccdbuf *), M_DEVBUF,
-	    M_WAITOK|M_ZERO);
+	    M_WAITOK | M_ZERO);
 	addr = bp->b_data;
 	for (bcount = bp->b_bcount; bcount > 0; bcount -= rcount) {
 		rcount = ccdbuffer(cs, bp, bn, addr, bcount, cbpp);
diff --git a/sys/dev/ic/ar5xxx.c b/sys/dev/ic/ar5xxx.c
index 57cf04bf7a4..928bcb55e7b 100644
--- a/sys/dev/ic/ar5xxx.c
+++ b/sys/dev/ic/ar5xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5xxx.c,v 1.43 2007/09/07 10:57:23 reyk Exp $	*/
+/*	$OpenBSD: ar5xxx.c,v 1.44 2007/09/11 13:39:33 gilles Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -174,7 +174,7 @@ ath_hal_attach(u_int16_t device, void *arg, bus_space_tag_t st,
 	}
 
 	if ((hal = malloc(sizeof(struct ath_hal),
-		 M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL) {
+		 M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
 		*status = ENOMEM;
 		AR5K_PRINT("out of memory\n");
 		return (NULL);
@@ -395,7 +395,7 @@ ath_hal_init_channels(struct ath_hal *hal, HAL_CHANNEL *channels,
 	HAL_CHANNEL *all_channels;
 
 	if ((all_channels = malloc(sizeof(HAL_CHANNEL) * max_channels,
-	    M_TEMP, M_NOWAIT|M_ZERO)) == NULL)
+	    M_TEMP, M_NOWAIT | M_ZERO)) == NULL)
 		return (AH_FALSE);
 
 	i = c = 0;
@@ -1496,7 +1496,7 @@ ar5k_rfregs(struct ath_hal *hal, HAL_CHANNEL *channel, u_int mode)
 	if (hal->ah_rf_banks == NULL) {
 		/* XXX do extra checks? */
 		if ((hal->ah_rf_banks = malloc(hal->ah_rf_banks_size,
-		    M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL) {
+		    M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
 			AR5K_PRINT("out of memory\n");
 			return (AH_FALSE);
 		}
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index 18b46065523..85685454b58 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpi.c,v 1.87 2007/09/07 12:11:11 dlg Exp $ */
+/*	$OpenBSD: mpi.c,v 1.88 2007/09/11 13:39:33 gilles Exp $ */
 
 /*
  * Copyright (c) 2005, 2006 David Gwynne <dlg@openbsd.org>
@@ -733,7 +733,7 @@ mpi_dmamem_alloc(struct mpi_softc *sc, size_t size)
 	struct mpi_dmamem		*mdm;
 	int				nsegs;
 
-	mdm = malloc(sizeof(struct mpi_dmamem), M_DEVBUF, M_NOWAIT|M_ZERO);
+	mdm = malloc(sizeof(struct mpi_dmamem), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (mdm == NULL)
 		return (NULL);
 
@@ -797,7 +797,7 @@ mpi_alloc_ccbs(struct mpi_softc *sc)
 	TAILQ_INIT(&sc->sc_ccb_free);
 
 	sc->sc_ccbs = malloc(sizeof(struct mpi_ccb) * sc->sc_maxcmds,
-	    M_DEVBUF, M_WAITOK|M_CANFAIL|M_ZERO);
+	    M_DEVBUF, M_WAITOK | M_CANFAIL | M_ZERO);
 	if (sc->sc_ccbs == NULL) {
 		printf("%s: unable to allocate ccbs\n", DEVNAME(sc));
 		return (1);
diff --git a/sys/dev/ksyms.c b/sys/dev/ksyms.c
index 8f80509b5bd..a377dbad4de 100644
--- a/sys/dev/ksyms.c
+++ b/sys/dev/ksyms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ksyms.c,v 1.18 2007/09/08 17:59:23 gilles Exp $	*/
+/*	$OpenBSD: ksyms.c,v 1.19 2007/09/11 13:39:33 gilles Exp $	*/
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
  * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>
@@ -132,7 +132,7 @@ ksymsattach(num)
 		struct exec *k1;
 
 		ksym_head_size = __LDPGSZ;
-		ksym_head = malloc(ksym_head_size, M_DEVBUF, M_NOWAIT|M_ZERO);
+		ksym_head = malloc(ksym_head_size, M_DEVBUF, M_NOWAIT | M_ZERO);
 		if (ksym_head == NULL) {
 			printf("failed to allocate memory for /dev/ksyms\n");
 			return;
diff --git a/sys/dev/midisyn.c b/sys/dev/midisyn.c
index 20916bf9f8d..bb0ee1410e5 100644
--- a/sys/dev/midisyn.c
+++ b/sys/dev/midisyn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midisyn.c,v 1.7 2007/09/08 17:59:23 gilles Exp $	*/
+/*	$OpenBSD: midisyn.c,v 1.8 2007/09/11 13:39:33 gilles Exp $	*/
 /*	$NetBSD: midisyn.c,v 1.5 1998/11/25 22:17:07 augustss Exp $	*/
 
 /*
@@ -180,7 +180,7 @@ midisyn_attach(sc, ms)
 {
 	if (ms->flags & MS_DOALLOC) {
 		ms->voices = malloc(ms->nvoice * sizeof (struct voice), 
-				    M_DEVBUF, M_WAITOK|M_ZERO);
+				    M_DEVBUF, M_WAITOK | M_ZERO);
 		ms->seqno = 1;
 		if (ms->mets->allocv == 0)
 			ms->mets->allocv = &midisyn_allocvoice;
diff --git a/sys/dev/pcmcia/cfxga.c b/sys/dev/pcmcia/cfxga.c
index 4fab88cad89..2132820295a 100644
--- a/sys/dev/pcmcia/cfxga.c
+++ b/sys/dev/pcmcia/cfxga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfxga.c,v 1.15 2007/09/09 01:00:35 fgsch Exp $	*/
+/*	$OpenBSD: cfxga.c,v 1.16 2007/09/11 13:39:33 gilles Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, Matthieu Herrb and Miodrag Vallat
@@ -223,7 +223,7 @@ cfxga_install_function(struct pcmcia_function *pf)
 
 	/* Create a simple cfe. */
 	cfe = (struct pcmcia_config_entry *)malloc(sizeof *cfe,
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cfe == NULL) {
 		DPRINTF(("%s: cfe allocation failed\n", __func__));
 		return (ENOMEM);
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index bc8527e5615..108be3d3a27 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xe.c,v 1.34 2007/09/07 18:21:40 fgsch Exp $	*/
+/*	$OpenBSD: if_xe.c,v 1.35 2007/09/11 13:39:33 gilles Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -249,7 +249,7 @@ xe_pcmcia_attach(parent, self, aux)
 
 	/* Fake a cfe. */
 	SIMPLEQ_FIRST(&pa->pf->cfe_head) = cfe = (struct pcmcia_config_entry *)
-	    malloc(sizeof *cfe, M_DEVBUF, M_NOWAIT|M_ZERO);
+	    malloc(sizeof *cfe, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (!cfe) {
 		printf(": function enable failed\n");
 		return;
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index 4b91b32271f..6659f0538c7 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcmcia.c,v 1.38 2007/09/07 18:21:40 fgsch Exp $	*/
+/*	$OpenBSD: pcmcia.c,v 1.39 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $	*/
 
 /*
@@ -200,7 +200,7 @@ pcmcia_card_attach(dev)
 	 * want to probe.  Fixup a function element for it.
 	 */
 	if (SIMPLEQ_FIRST(&sc->card.pf_head) == NULL) {
-		pf = malloc(sizeof *pf, M_DEVBUF, M_NOWAIT|M_ZERO);
+		pf = malloc(sizeof *pf, M_DEVBUF, M_NOWAIT | M_ZERO);
 		if (pf == NULL)
 			panic("pcmcia_card_attach");
 		pf->number = 0;
diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index 52dba7ab474..e3db1547070 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcmcia_cis.c,v 1.14 2007/09/07 18:21:40 fgsch Exp $	*/
+/*	$OpenBSD: pcmcia_cis.c,v 1.15 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: pcmcia_cis.c,v 1.9 1998/08/22 23:41:48 msaitoh Exp $	*/
 
 /*
@@ -845,7 +845,7 @@ pcmcia_parse_cis_tuple(tuple, arg)
 		}
 		if (state->pf == NULL) {
 			state->pf = malloc(sizeof(*state->pf), M_DEVBUF,
-			    M_NOWAIT|M_ZERO);
+			    M_NOWAIT | M_ZERO);
 			if (state->pf == NULL)
 				panic("pcmcia_parse_cis_tuple");
 			state->pf->number = state->count++;
@@ -885,7 +885,7 @@ pcmcia_parse_cis_tuple(tuple, arg)
 			}
 			if (state->pf == NULL) {
 				state->pf = malloc(sizeof(*state->pf),
-				    M_DEVBUF, M_NOWAIT|M_ZERO);
+				    M_DEVBUF, M_NOWAIT | M_ZERO);
 				if (state->pf == NULL)
 					panic("pcmcia_parse_cis_tuple");
 				state->pf->number = state->count++;
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index 18685fdd91f..c193d5c3351 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ramdisk.c,v 1.38 2007/09/08 17:59:23 gilles Exp $	*/
+/*	$OpenBSD: ramdisk.c,v 1.39 2007/09/11 13:39:33 gilles Exp $	*/
 /*	$NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $	*/
 
 /*
@@ -147,7 +147,7 @@ rdattach(n)
 
 	/* Attach as if by autoconfig. */
 	for (i = 0; i < n; i++) {
-		sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK|M_ZERO);
+		sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
 		if (snprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname),
 		    "rd%d", i) >= sizeof(sc->sc_dev.dv_xname)) {
 			printf("rdattach: device name too long\n");
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
index 48cb2bddac1..77384f6aed1 100644
--- a/sys/dev/sbus/dma_sbus.c
+++ b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma_sbus.c,v 1.14 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: dma_sbus.c,v 1.15 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: dma_sbus.c,v 1.5 2000/07/09 20:57:42 pk Exp $ */
 
 /*-
@@ -279,7 +279,7 @@ dma_alloc_bustag(struct dma_softc *sc)
 {
 	struct sparc_bus_space_tag *sbt;
 
-	sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT|M_ZERO);
+	sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sbt == NULL)
 		return (NULL);
 
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index ea8aa78cfda..a9703d5a39b 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_sbus.c,v 1.9 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: isp_sbus.c,v 1.10 2007/09/11 13:39:34 gilles Exp $	*/
 /* $NetBSD: isp_sbus.c,v 1.46 2001/09/26 20:53:14 eeh Exp $ */
 
 /*
@@ -380,7 +380,7 @@ isp_sbus_mbxdma(struct ispsoftc *isp)
 		return (0);
 
 	n = isp->isp_maxcmds * sizeof (XS_T *);
-	isp->isp_xflist = (XS_T **) malloc(n, M_DEVBUF, M_WAITOK|M_ZERO);
+	isp->isp_xflist = (XS_T **) malloc(n, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (isp->isp_xflist == NULL) {
 		isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
 		return (1);
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 1cc9f1cf2db..006e33eafe6 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lebuffer.c,v 1.7 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: lebuffer.c,v 1.8 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: lebuffer.c,v 1.12 2002/03/11 16:00:57 pk Exp $ */
 
 /*-
@@ -131,7 +131,7 @@ lebufattach(struct device *parent, struct device *self, void *aux)
 	sc->sc_burst &= sbusburst;
 
 	/* Allocate a bus tag */
-	sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT|M_ZERO);
+	sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sbt == NULL) {
 		printf("%s: attach: out of memory\n", self->dv_xname);
 		return;
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index bc699718374..84c63191bc8 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qec.c,v 1.11 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: qec.c,v 1.12 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: qec.c,v 1.12 2000/12/04 20:12:55 fvdl Exp $ */
 
 /*-
@@ -192,7 +192,7 @@ qecattach(parent, self, aux)
 	}
 
 	/* Allocate a bus tag */
-	sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT|M_ZERO);
+	sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sbt == NULL) {
 		printf("%s: attach: out of memory\n", self->dv_xname);
 		return;
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index c4948cfa0f2..6a7fac743a8 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc.c,v 1.13 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: sdmmc.c,v 1.14 2007/09/11 13:39:34 gilles Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -420,7 +420,7 @@ sdmmc_function_alloc(struct sdmmc_softc *sc)
 	struct sdmmc_function *sf;
 
 	sf = (struct sdmmc_function *)malloc(sizeof *sf, M_DEVBUF,
-	    M_WAITOK|M_ZERO);
+	    M_WAITOK | M_ZERO);
 	sf->sc = sc;
 	sf->number = -1;
 	sf->cis.manufacturer = SDMMC_VENDOR_INVALID;
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 8a49dd3c2ce..317025e19fe 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_scsi.c,v 1.8 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: sdmmc_scsi.c,v 1.9 2007/09/11 13:39:34 gilles Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -100,10 +100,10 @@ sdmmc_scsi_attach(struct sdmmc_softc *sc)
 	struct sdmmc_function *sf;
 
 	scbus = (struct sdmmc_scsi_softc *)malloc(sizeof *scbus,
-	    M_DEVBUF, M_WAITOK|M_ZERO);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	scbus->sc_tgt = (struct sdmmc_scsi_target *)malloc(sizeof(*scbus->sc_tgt) *
-	    (SDMMC_SCSIID_MAX+1), M_DEVBUF, M_WAITOK|M_ZERO);
+	    (SDMMC_SCSIID_MAX+1), M_DEVBUF, M_WAITOK | M_ZERO);
 
 	/*
 	 * Each card that sent us a CID in the identification stage
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 87d9f28fad6..8f209fdb8d7 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.83 2007/09/08 17:59:23 gilles Exp $ */
+/* $OpenBSD: softraid.c,v 1.84 2007/09/11 13:39:33 gilles Exp $ */
 /*
  * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
  *
@@ -248,7 +248,7 @@ sr_alloc_ccb(struct sr_discipline *sd)
 		return (1);
 
 	sd->sd_ccb = malloc(sizeof(struct sr_ccb) *
-	    sd->sd_max_wu * sd->sd_max_ccb_per_wu, M_DEVBUF, M_WAITOK|M_ZERO);
+	    sd->sd_max_wu * sd->sd_max_ccb_per_wu, M_DEVBUF, M_WAITOK | M_ZERO);
 	TAILQ_INIT(&sd->sd_ccb_freeq);
 	for (i = 0; i < sd->sd_max_wu * sd->sd_max_ccb_per_wu; i++) {
 		ccb = &sd->sd_ccb[i];
@@ -340,7 +340,7 @@ sr_alloc_wu(struct sr_discipline *sd)
 	sd->sd_wu_pending = no_wu;
 
 	sd->sd_wu = malloc(sizeof(struct sr_workunit) * no_wu,
-	    M_DEVBUF, M_WAITOK|M_ZERO);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 	TAILQ_INIT(&sd->sd_wu_freeq);
 	TAILQ_INIT(&sd->sd_wu_pendq);
 	TAILQ_INIT(&sd->sd_wu_defq);
@@ -763,13 +763,13 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user)
 	if (bc->bc_dev_list_len > BIOC_CRMAXLEN)
 		goto unwind;
 
-	dt = malloc(bc->bc_dev_list_len, M_DEVBUF, M_WAITOK|M_ZERO);
+	dt = malloc(bc->bc_dev_list_len, M_DEVBUF, M_WAITOK | M_ZERO);
 	if (user)
 		copyin(bc->bc_dev_list, dt, bc->bc_dev_list_len);
 	else
 		bcopy(bc->bc_dev_list, dt, bc->bc_dev_list_len);
 
-	sd = malloc(sizeof(struct sr_discipline), M_DEVBUF, M_WAITOK|M_ZERO);
+	sd = malloc(sizeof(struct sr_discipline), M_DEVBUF, M_WAITOK | M_ZERO);
 	sd->sd_sc = sc;
 
 	no_chunk = bc->bc_dev_list_len / sizeof(dev_t);
@@ -779,11 +779,11 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user)
 		goto unwind;
 
 	/* in memory copy of metadata */
-	sd->sd_meta = malloc(SR_META_SIZE * 512 , M_DEVBUF, M_WAITOK|M_ZERO);
+	sd->sd_meta = malloc(SR_META_SIZE * 512 , M_DEVBUF, M_WAITOK | M_ZERO);
 
 	/* we have a valid list now create an array index */
 	sd->sd_vol.sv_chunks = malloc(sizeof(struct sr_chunk *) * no_chunk,
-	    M_DEVBUF, M_WAITOK|M_ZERO);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	/* force the raid volume by clearing metadata region */
 	if (bc->bc_flags & BIOC_SCFORCE) {
@@ -1021,7 +1021,8 @@ sr_open_chunks(struct sr_softc *sc, struct sr_chunk_head *cl, dev_t *dt,
 
 	/* fill out chunk list */
 	for (i = 0; i < no_chunk; i++) {
-		ch_entry = malloc(sizeof(struct sr_chunk), M_DEVBUF, M_WAITOK|M_ZERO);
+		ch_entry = malloc(sizeof(struct sr_chunk), M_DEVBUF,
+		    M_WAITOK | M_ZERO);
 		/* keep disks in user supplied order */
 		if (ch_prev)
 			SLIST_INSERT_AFTER(ch_prev, ch_entry, src_link);
@@ -1104,7 +1105,7 @@ sr_read_meta(struct sr_discipline *sd)
 
 	DNPRINTF(SR_D_META, "%s: sr_read_meta\n", DEVNAME(sc));
 
-	m = malloc(sz , M_DEVBUF, M_WAITOK|M_ZERO);
+	m = malloc(sz , M_DEVBUF, M_WAITOK | M_ZERO);
 
 	SLIST_FOREACH(ch_entry, cl, src_link) {
 		bzero(&b, sizeof(b));
@@ -1785,7 +1786,7 @@ sr_clear_metadata(struct sr_discipline *sd)
 
 	DNPRINTF(SR_D_META, "%s: sr_clear_metadata\n", DEVNAME(sc));
 
-	m = malloc(sz , M_DEVBUF, M_WAITOK|M_ZERO);
+	m = malloc(sz , M_DEVBUF, M_WAITOK | M_ZERO);
 
 	SLIST_FOREACH(ch_entry, cl, src_link) {
 		bzero(&b, sizeof(b));
@@ -2098,9 +2099,10 @@ sr_boot_assembly(struct sr_softc *sc)
 			sm = (struct sr_metadata *)bp->b_data;
 			if (!sr_validate_metadata(sc, devr, sm)) {
 				/* we got one; save it off */
-				mle = malloc(sizeof(*mle), M_DEVBUF, M_WAITOK|M_ZERO);
+				mle = malloc(sizeof(*mle), M_DEVBUF,
+				    M_WAITOK | M_ZERO);
 				mle->sml_metadata = malloc(sz, M_DEVBUF,
-				    M_WAITOK|M_ZERO);
+				    M_WAITOK | M_ZERO);
 				bcopy(sm, mle->sml_metadata, sz);
 				mle->sml_mm = devr;
 				SLIST_INSERT_HEAD(&mlh, mle, sml_link);
@@ -2901,7 +2903,7 @@ sr_raidc_getcryptop(struct sr_workunit *wu, int encrypt)
 	DNPRINTF(SR_D_DIS, "%s: sr_raidc_getcryptop wu: %p encrypt: %d\n",
 	    DEVNAME(sd->sd_sc), wu, encrypt);
 
-	uio = malloc(sizeof(*uio), M_DEVBUF, M_WAITOK|M_ZERO);
+	uio = malloc(sizeof(*uio), M_DEVBUF, M_WAITOK | M_ZERO);
 	uio->uio_iov = malloc(sizeof(*uio->uio_iov), M_DEVBUF, M_WAITOK);
 	uio->uio_iovcnt = 1;
 	uio->uio_iov->iov_base = xs->data;
diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c
index 5546815917c..c46227b9c6e 100644
--- a/sys/dev/systrace.c
+++ b/sys/dev/systrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systrace.c,v 1.45 2007/09/10 19:49:31 gilles Exp $	*/
+/*	$OpenBSD: systrace.c,v 1.46 2007/09/11 13:39:33 gilles Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -563,7 +563,7 @@ systraceioctl(dev, cmd, data, flag, p)
 	switch (cmd) {
 	case STRIOCCLONE:
 		fst = (struct fsystrace *)malloc(sizeof(struct fsystrace),
-		    M_XDATA, M_WAITOK|M_ZERO);
+		    M_XDATA, M_WAITOK | M_ZERO);
 		rw_init(&fst->lock, "systrace");
 		TAILQ_INIT(&fst->processes);
 		TAILQ_INIT(&fst->messages);
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index 89439266542..b877251d317 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hid.c,v 1.19 2007/09/09 01:00:35 fgsch Exp $ */
+/*	$OpenBSD: hid.c,v 1.20 2007/09/11 13:39:34 gilles Exp $ */
 /*	$NetBSD: hid.c,v 1.23 2002/07/11 21:14:25 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
@@ -95,7 +95,7 @@ hid_start_parse(void *d, int len, enum hid_kind kind)
 {
 	struct hid_data *s;
 
-	s = malloc(sizeof *s, M_TEMP, M_WAITOK|M_ZERO);
+	s = malloc(sizeof *s, M_TEMP, M_WAITOK | M_ZERO);
 	if (s == NULL)
 		panic("hid_start_parse");
 
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index dced36df11f..adc29d73dd0 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.50 2007/09/09 01:00:35 fgsch Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.51 2007/09/11 13:39:34 gilles Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -1827,7 +1827,7 @@ uaudio_identify_ac(struct uaudio_softc *sc, const usb_config_descriptor_t *cdesc
 	ibufend = ibuf + aclen;
 	dp = (const usb_descriptor_t *)ibuf;
 	ndps = 0;
-	iot = malloc(sizeof(struct io_terminal) * 256, M_TEMP, M_NOWAIT|M_ZERO);
+	iot = malloc(sizeof(struct io_terminal) * 256, M_TEMP, M_NOWAIT | M_ZERO);
 	if (iot == NULL) {
 		printf("%s: no memory\n", __func__);
 		return USBD_NOMEM;
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 3386a06a351..a3ba73222a2 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucycom.c,v 1.12 2007/09/10 16:29:28 fgsch Exp $	*/
+/*	$OpenBSD: ucycom.c,v 1.13 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $	*/
 
 /*
@@ -281,7 +281,7 @@ ucycom_open(void *addr, int portno)
 		return (EIO);
 
 	/* Allocate an output report buffer */
-	sc->sc_obuf = malloc(sc->sc_olen, M_USBDEV, M_WAITOK|M_ZERO);
+	sc->sc_obuf = malloc(sc->sc_olen, M_USBDEV, M_WAITOK | M_ZERO);
 
 	/* Allocate an input report buffer */
 	sc->sc_ibuf = malloc(sc->sc_ilen, M_USBDEV, M_WAITOK);
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 499a2e2f3b4..fd32f8210a8 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.62 2007/09/10 16:29:28 fgsch Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.63 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -577,7 +577,7 @@ uhci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size)
 		uhci_soft_td_t **stds;
 		DPRINTF(("uhci_allocm: get %d TDs\n", n));
 		stds = malloc(sizeof(uhci_soft_td_t *) * n, M_TEMP,
-			      M_NOWAIT|M_ZERO);
+			      M_NOWAIT | M_ZERO);
 		if (stds == NULL)
 			panic("uhci_allocm");
 		for(i=0; i < n; i++)
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index b9c09ec7a53..f54f11d045e 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.c,v 1.28 2007/09/09 01:00:35 fgsch Exp $	*/
+/*	$OpenBSD: uhidev.c,v 1.29 2007/09/11 13:39:34 gilles Exp $	*/
 /*	$NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -259,7 +259,7 @@ uhidev_attach(struct device *parent, struct device *self, void *aux)
 		printf("%s: %d report ids\n", sc->sc_dev.dv_xname, nrepid);
 	nrepid++;
 	sc->sc_subdevs = malloc(nrepid * sizeof(struct device *),
-	    M_USBDEV, M_NOWAIT|M_ZERO);
+	    M_USBDEV, M_NOWAIT | M_ZERO);
 	if (sc->sc_subdevs == NULL) {
 		printf("%s: no memory\n", sc->sc_dev.dv_xname);
 		return;
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 7a66501691b..c3dacfe467e 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_subr.c,v 1.59 2007/09/09 18:36:13 deraadt Exp $ */
+/*	$OpenBSD: usb_subr.c,v 1.60 2007/09/11 13:39:34 gilles Exp $ */
 /*	$NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -890,7 +890,7 @@ usbd_probe_and_attach(struct device *parent, usbd_device_handle dev, int port,
 		uaa.ifaces = ifaces;
 		uaa.nifaces = nifaces;
 		len = (nifaces+1) * sizeof dv;
-		dev->subdevs = malloc(len, M_USB, M_NOWAIT|M_ZERO);
+		dev->subdevs = malloc(len, M_USB, M_NOWAIT | M_ZERO);
 		if (dev->subdevs == NULL) {
 			free(ifaces, M_USB);
 			return (USBD_NOMEM);
diff --git a/sys/dev/usb/usbf_subr.c b/sys/dev/usb/usbf_subr.c
index e5bc5dd5768..711a08787a7 100644
--- a/sys/dev/usb/usbf_subr.c
+++ b/sys/dev/usb/usbf_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbf_subr.c,v 1.11 2007/09/09 01:00:35 fgsch Exp $	*/
+/*	$OpenBSD: usbf_subr.c,v 1.12 2007/09/11 13:39:34 gilles Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -151,7 +151,7 @@ usbf_new_device(struct device *parent, usbf_bus_handle bus, int depth,
 	KASSERT(up->device == NULL);
 #endif
 
-	dev = malloc(sizeof(*dev), M_USB, M_NOWAIT|M_ZERO);
+	dev = malloc(sizeof(*dev), M_USB, M_NOWAIT | M_ZERO);
 	if (dev == NULL)
 		return USBF_NOMEM;
 
@@ -396,11 +396,11 @@ usbf_add_config(usbf_device_handle dev, usbf_config_handle *ucp)
 	struct usbf_config *uc;
 	usb_config_descriptor_t *cd;
 
-	uc = malloc(sizeof *uc, M_USB, M_NOWAIT|M_ZERO);
+	uc = malloc(sizeof *uc, M_USB, M_NOWAIT | M_ZERO);
 	if (uc == NULL)
 		return USBF_NOMEM;
 
-	cd = malloc(sizeof *cd, M_USB, M_NOWAIT|M_ZERO);
+	cd = malloc(sizeof *cd, M_USB, M_NOWAIT | M_ZERO);
 	if (cd == NULL) {
 		free(uc, M_USB);
 		return USBF_NOMEM;
@@ -472,11 +472,11 @@ usbf_add_interface(usbf_config_handle uc, u_int8_t bInterfaceClass,
 	if (uc->uc_closed)
 		return USBF_INVAL;
 
-	ui = malloc(sizeof *ui, M_USB, M_NOWAIT|M_ZERO);
+	ui = malloc(sizeof *ui, M_USB, M_NOWAIT | M_ZERO);
 	if (ui == NULL)
 		return USBF_NOMEM;
 
-	id = malloc(sizeof *id, M_USB, M_NOWAIT|M_ZERO);
+	id = malloc(sizeof *id, M_USB, M_NOWAIT | M_ZERO);
 	if (id == NULL) {
 		free(ui, M_USB);
 		return USBF_NOMEM;
@@ -513,11 +513,11 @@ usbf_add_endpoint(usbf_interface_handle ui, u_int8_t bEndpointAddress,
 	if (ui->config->uc_closed)
 		return USBF_INVAL;
 
-	ue = malloc(sizeof *ue, M_USB, M_NOWAIT|M_ZERO);
+	ue = malloc(sizeof *ue, M_USB, M_NOWAIT | M_ZERO);
 	if (ue == NULL)
 		return USBF_NOMEM;
 
-	ed = malloc(sizeof *ed, M_USB, M_NOWAIT|M_ZERO);
+	ed = malloc(sizeof *ed, M_USB, M_NOWAIT | M_ZERO);
 	if (ed == NULL) {
 		free(ue, M_USB);
 		return USBF_NOMEM;
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 4373b0eee51..e6fbb70de64 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.80 2007/09/08 17:59:23 gilles Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.81 2007/09/11 13:39:33 gilles Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -198,7 +198,7 @@ vndattach(int num)
 	if (num <= 0)
 		return;
 	size = num * sizeof(struct vnd_softc);
-	mem = malloc(size, M_DEVBUF, M_NOWAIT|M_ZERO);
+	mem = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (mem == NULL) {
 		printf("WARNING: no memory for vnode disks\n");
 		return;
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index a59894075f6..1b376ddd123 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100.c,v 1.19 2007/09/10 19:49:31 gilles Exp $ */
+/* $OpenBSD: wsemul_vt100.c,v 1.20 2007/09/11 13:39:34 gilles Exp $ */
 /* $NetBSD: wsemul_vt100.c,v 1.13 2000/04/28 21:56:16 mycroft Exp $ */
 
 /*
@@ -214,7 +214,7 @@ wsemul_vt100_attach(console, type, cookie, ccol, crow, cbcookie, defattr)
 	edp->cbcookie = cbcookie;
 
 	edp->tabs = malloc(edp->ncols, M_DEVBUF, M_NOWAIT);
-	edp->dblwid = malloc(edp->nrows, M_DEVBUF, M_NOWAIT|M_ZERO);
+	edp->dblwid = malloc(edp->nrows, M_DEVBUF, M_NOWAIT | M_ZERO);
 	edp->dw = 0;
 	edp->dcsarg = malloc(DCS_MAXLEN, M_DEVBUF, M_NOWAIT);
 	edp->isolatin1tab = malloc(128 * sizeof(int), M_DEVBUF, M_NOWAIT);
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index fe35b9c7b08..6766332b7f9 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsevent.c,v 1.6 2007/09/10 19:49:31 gilles Exp $ */
+/* $OpenBSD: wsevent.c,v 1.7 2007/09/11 13:39:34 gilles Exp $ */
 /* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
 
 /*
@@ -104,7 +104,7 @@ wsevent_init(struct wseventvar *ev)
 	}
 	ev->get = ev->put = 0;
 	ev->q = malloc((u_long)WSEVENT_QSIZE * sizeof(struct wscons_event),
-	    M_DEVBUF, M_WAITOK|M_ZERO);
+	    M_DEVBUF, M_WAITOK | M_ZERO);
 }
 
 /*
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 3946b70c3f5..d728335f4ac 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.57 2007/09/10 19:49:31 gilles Exp $ */
+/* $OpenBSD: wskbd.c,v 1.58 2007/09/11 13:39:34 gilles Exp $ */
 /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
 
 /*
@@ -385,7 +385,7 @@ wskbd_attach(struct device *parent, struct device *self, void *aux)
 		sc->id = &wskbd_console_data;
 	} else {
 		sc->id = malloc(sizeof(struct wskbd_internal),
-		    M_DEVBUF, M_WAITOK|M_ZERO);
+		    M_DEVBUF, M_WAITOK | M_ZERO);
 		sc->id->t_keymap = ap->keymap;
 		wskbd_update_layout(sc->id, ap->keymap->layout);
 	}