KNF

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

7 files changed, 20 insertions, 20 deletions

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;