Apply some KNF after the recent removal of macros and type definitions.

No binary change.

ok ray.

23 files changed, 214 insertions, 218 deletions

diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c
index 37302547cad..d68478c9bcc 100644
--- a/sys/dev/usb/moscom.c
+++ b/sys/dev/usb/moscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moscom.c,v 1.8 2007/06/12 16:26:36 mbalmer Exp $	*/
+/*	$OpenBSD: moscom.c,v 1.9 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -133,16 +133,16 @@
 #define MOSCOM_BAUD_REF		115200
 
 struct moscom_softc {
-	struct device		sc_dev;
-	usbd_device_handle	sc_udev;
-	usbd_interface_handle	sc_iface;
-	struct device *		sc_subdev;
+	struct device		 sc_dev;
+	usbd_device_handle	 sc_udev;
+	usbd_interface_handle	 sc_iface;
+	struct device		*sc_subdev;
 
-	u_char			sc_msr;
-	u_char			sc_lsr;
-	u_char			sc_lcr;
+	u_char			 sc_msr;
+	u_char			 sc_lsr;
+	u_char			 sc_lcr;
 
-	u_char			sc_dying;
+	u_char			 sc_dying;
 };
 
 void	moscom_get_status(void *, int, u_char *, u_char *);
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index 693d1860f82..a06daca7d40 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uark.c,v 1.8 2007/06/12 16:26:36 mbalmer Exp $	*/
+/*	$OpenBSD: uark.c,v 1.9 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -60,15 +60,15 @@ int	uarkebug = 0;
 #define UARK_REQUEST		0xfe
 
 struct uark_softc {
-	struct device		sc_dev;
-	usbd_device_handle	sc_udev;
-	usbd_interface_handle	sc_iface;
-	struct device *		sc_subdev;
+	struct device		 sc_dev;
+	usbd_device_handle	 sc_udev;
+	usbd_interface_handle	 sc_iface;
+	struct device 		*sc_subdev;
 
-	u_char			sc_msr;
-	u_char			sc_lsr;
+	u_char			 sc_msr;
+	u_char			 sc_lsr;
 
-	u_char			sc_dying;
+	u_char			 sc_dying;
 };
 
 void	uark_get_status(void *, int portno, u_char *lsr, u_char *msr);
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 8cc30ef0155..8c4341a356e 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.45 2007/06/12 16:26:36 mbalmer Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.46 2007/06/13 06:25:03 mbalmer Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -156,29 +156,29 @@ struct chan {
 };
 
 struct uaudio_softc {
-	struct device	sc_dev;		/* base device */
+	struct device	 sc_dev;	/* base device */
 	usbd_device_handle sc_udev;	/* USB device */
-	int		sc_ac_iface;	/* Audio Control interface */
+	int		 sc_ac_iface;	/* Audio Control interface */
 	usbd_interface_handle	sc_ac_ifaceh;
-	struct chan	sc_playchan;	/* play channel */
-	struct chan	sc_recchan;	/* record channel */
-	int		sc_nullalt;
-	int		sc_audio_rev;
+	struct chan	 sc_playchan;	/* play channel */
+	struct chan	 sc_recchan;	/* record channel */
+	int		 sc_nullalt;
+	int		 sc_audio_rev;
 	struct as_info	*sc_alts;	/* alternate settings */
-	int		sc_nalts;	/* # of alternate settings */
-	int		sc_altflags;
-#define HAS_8		0x01
-#define HAS_16		0x02
-#define HAS_8U		0x04
-#define HAS_ALAW	0x08
-#define HAS_MULAW	0x10
-#define UA_NOFRAC	0x20		/* don't do sample rate adjustment */
-#define HAS_24		0x40
-	int		sc_mode;	/* play/record capability */
+	int		 sc_nalts;	/* # of alternate settings */
+	int		 sc_altflags;
+#define HAS_8		 0x01
+#define HAS_16		 0x02
+#define HAS_8U		 0x04
+#define HAS_ALAW	 0x08
+#define HAS_MULAW	 0x10
+#define UA_NOFRAC	 0x20		/* don't do sample rate adjustment */
+#define HAS_24		 0x40
+	int		 sc_mode;	/* play/record capability */
 	struct mixerctl *sc_ctls;	/* mixer controls */
-	int		sc_nctls;	/* # of mixer controls */
-	struct device *	sc_audiodev;
-	char		sc_dying;
+	int		 sc_nctls;	/* # of mixer controls */
+	struct device	*sc_audiodev;
+	char		 sc_dying;
 };
 
 struct terminal_list {
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index f94e8a63e5d..ef26d30c1b6 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.28 2007/06/12 16:26:36 mbalmer Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.29 2007/06/13 06:25:03 mbalmer Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -157,26 +157,26 @@ int	ubsadebug = 0;
 #define	UBSA_MSR_DCTS		0x01	/* CTS has changed state */
 
 struct	ubsa_softc {
-	struct device		sc_dev;		/* base device */
-	usbd_device_handle	sc_udev;	/* USB device */
-	usbd_interface_handle	sc_iface;	/* interface */
+	struct device		 sc_dev;	/* base device */
+	usbd_device_handle	 sc_udev;	/* USB device */
+	usbd_interface_handle	 sc_iface;	/* interface */
 
-	int			sc_iface_number;	/* interface number */
+	int			 sc_iface_number;	/* interface number */
 
-	int			sc_intr_number;	/* interrupt number */
-	usbd_pipe_handle	sc_intr_pipe;	/* interrupt pipe */
+	int			 sc_intr_number;	/* interrupt number */
+	usbd_pipe_handle	 sc_intr_pipe;	/* interrupt pipe */
 	u_char			*sc_intr_buf;	/* interrupt buffer */
-	int			sc_isize;
+	int			 sc_isize;
 
-	u_char			sc_dtr;		/* current DTR state */
-	u_char			sc_rts;		/* current RTS state */
+	u_char			 sc_dtr;	/* current DTR state */
+	u_char			 sc_rts;	/* current RTS state */
 
-	u_char			sc_lsr;		/* Local status register */
-	u_char			sc_msr;		/* ubsa status register */
+	u_char			 sc_lsr;	/* Local status register */
+	u_char			 sc_msr;	/* ubsa status register */
 
-	struct device *		sc_subdev;	/* ucom device */
+	struct device		*sc_subdev;	/* ucom device */
 
-	u_char			sc_dying;	/* disconnecting */
+	u_char			 sc_dying;	/* disconnecting */
 
 };
 
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 2cfdbb86048..bb703d3c14c 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucycom.c,v 1.9 2007/06/12 16:26:36 mbalmer Exp $	*/
+/*	$OpenBSD: ucycom.c,v 1.10 2007/06/13 06:25:03 mbalmer Exp $	*/
 /*	$NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $	*/
 
 /*
@@ -107,31 +107,31 @@ int	ucycomdebug = 200;
 #define UCYCOM_ORESET	0x08
 
 struct ucycom_softc {
-	struct uhidev		sc_hdev;
-	usbd_device_handle	sc_udev;
+	struct uhidev		 sc_hdev;
+	usbd_device_handle	 sc_udev;
 
 	/* uhidev parameters */
-	size_t			sc_flen; /* feature report length */
-	size_t			sc_ilen; /* input report length */
-	size_t			sc_olen; /* output report length */
+	size_t			 sc_flen;	/* feature report length */
+	size_t			 sc_ilen;	/* input report length */
+	size_t			 sc_olen;	/* output report length */
 
 	uint8_t			*sc_obuf;
 
 	uint8_t			*sc_ibuf;
-	uint32_t		sc_icnt;
+	uint32_t		 sc_icnt;
 
 	/* settings */
-	uint32_t		sc_baud;
-	uint8_t			sc_cfg;	/* Data format */
-	uint8_t			sc_mcr;	/* Modem control */
-	uint8_t			sc_msr;	/* Modem status */
-	uint8_t			sc_newmsr; /* from HID intr */
-	int			sc_swflags;
+	uint32_t		 sc_baud;
+	uint8_t			 sc_cfg;	/* Data format */
+	uint8_t			 sc_mcr;	/* Modem control */
+	uint8_t			 sc_msr;	/* Modem status */
+	uint8_t			 sc_newmsr;	/* from HID intr */
+	int			 sc_swflags;
 
-	struct device *		sc_subdev;
+	struct device		*sc_subdev;
 
 	/* flags */
-	u_char			sc_dying;
+	u_char			 sc_dying;
 };
 
 /* Callback routines */
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index 87d4132bcd4..d58828e3bec 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udsbr.c,v 1.16 2007/06/12 16:26:36 mbalmer Exp $	*/
+/*	$OpenBSD: udsbr.c,v 1.17 2007/06/13 06:25:03 mbalmer Exp $	*/
 /*	$NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $	*/
 
 /*
@@ -82,24 +82,23 @@ struct radio_hw_if udsbr_hw_if = {
 };
 
 struct udsbr_softc {
- 	struct device		sc_dev;
-	usbd_device_handle	sc_udev;
+ 	struct device		 sc_dev;
+	usbd_device_handle	 sc_udev;
 
-	char			sc_mute;
-	char			sc_vol;
-	u_int32_t		sc_freq;
+	char			 sc_mute;
+	char			 sc_vol;
+	u_int32_t		 sc_freq;
 
 	struct device		*sc_child;
 
-	char			sc_dying;
+	char			 sc_dying;
 };
 
-	int	udsbr_req(struct udsbr_softc *sc, int ureq, int value,
-			  int index);
-	void	udsbr_start(struct udsbr_softc *sc);
-	void	udsbr_stop(struct udsbr_softc *sc);
-	void	udsbr_setfreq(struct udsbr_softc *sc, int freq);
-	int	udsbr_status(struct udsbr_softc *sc);
+int	udsbr_req(struct udsbr_softc *sc, int ureq, int value, int index);
+void	udsbr_start(struct udsbr_softc *sc);
+void	udsbr_stop(struct udsbr_softc *sc);
+void	udsbr_setfreq(struct udsbr_softc *sc, int freq);
+int	udsbr_status(struct udsbr_softc *sc);
 
 USB_DECLARE_DRIVER(udsbr);
 
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index f25d0674509..7db56f45a8f 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.39 2007/06/12 16:26:36 mbalmer Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.40 2007/06/13 06:25:03 mbalmer Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -85,21 +85,21 @@ int uftdidebug = 0;
 #define UFTDIOBUFSIZE 64
 
 struct uftdi_softc {
-	struct device		sc_dev;		/* base device */
-	usbd_device_handle	sc_udev;	/* device */
-	usbd_interface_handle	sc_iface;	/* interface */
+	struct device		 sc_dev;		/* base device */
+	usbd_device_handle	 sc_udev;	/* device */
+	usbd_interface_handle	 sc_iface;	/* interface */
 
-	enum uftdi_type		sc_type;
-	u_int			sc_hdrlen;
+	enum uftdi_type		 sc_type;
+	u_int			 sc_hdrlen;
 
-	u_char			sc_msr;
-	u_char			sc_lsr;
+	u_char			 sc_msr;
+	u_char			 sc_lsr;
 
-	struct device *		sc_subdev;
+	struct device		*sc_subdev;
 
-	u_char			sc_dying;
+	u_char			 sc_dying;
 
-	u_int			last_lcr;
+	u_int			 last_lcr;
 };
 
 void	uftdi_get_status(void *, int portno, u_char *lsr, u_char *msr);
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index 44148cbb710..b6d44150d3b 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipaq.c,v 1.10 2007/06/12 16:26:36 mbalmer Exp $	*/
+/*	$OpenBSD: uipaq.c,v 1.11 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -81,16 +81,16 @@ int uipaqdebug = 0;
 #define UIPAQOBUFSIZE 1024
 
 struct uipaq_softc {
-	struct device		sc_dev;		/* base device */
-	usbd_device_handle	sc_udev;	/* device */
-	usbd_interface_handle	sc_iface;	/* interface */
+	struct device		 sc_dev;	/* base device */
+	usbd_device_handle	 sc_udev;	/* device */
+	usbd_interface_handle	 sc_iface;	/* interface */
 
-	struct device *		sc_subdev;	/* ucom uses that */
-	u_int16_t		sc_lcr;		/* state for DTR/RTS */
+	struct device		*sc_subdev;	/* ucom uses that */
+	u_int16_t		 sc_lcr;	/* state for DTR/RTS */
 
-	u_int16_t		sc_flags;
+	u_int16_t		 sc_flags;
 
-	u_char			sc_dying;
+	u_char			 sc_dying;
 };
 
 /* Callback routines */
diff --git a/sys/dev/usb/umassvar.h b/sys/dev/usb/umassvar.h
index f436f0dbb4a..e60b29a8f77 100644
--- a/sys/dev/usb/umassvar.h
+++ b/sys/dev/usb/umassvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umassvar.h,v 1.11 2007/06/12 16:26:36 mbalmer Exp $ */
+/*	$OpenBSD: umassvar.h,v 1.12 2007/06/13 06:25:03 mbalmer Exp $ */
 /*	$NetBSD: umassvar.h,v 1.20 2003/09/08 19:31:01 mycroft Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
@@ -146,7 +146,7 @@ struct umass_wire_methods {
 };
 
 struct umassbus_softc {
-	struct device *		sc_child;	/* child device, for detach */
+	struct device		*sc_child;	/* child device, for detach */
 };
 
 /* the per device structure */
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index bed349693bd..b79ed5c8057 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.24 2007/06/12 16:26:36 mbalmer Exp $	*/
+/*	$OpenBSD: umct.c,v 1.25 2007/06/13 06:25:03 mbalmer Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -81,32 +81,32 @@ int	umctdebug = 0;
 #define	UMCT_IFACE_INDEX	0
 
 struct	umct_softc {
-	struct device		sc_dev;		/* base device */
+	struct device		 sc_dev;	/* base device */
 	usbd_device_handle	sc_udev;	/* USB device */
-	usbd_interface_handle	sc_iface;	/* interface */
-	int			sc_iface_number;	/* interface number */
-	u_int16_t		sc_product;
+	usbd_interface_handle	 sc_iface;	/* interface */
+	int			 sc_iface_number;	/* interface number */
+	u_int16_t		 sc_product;
 
-	int			sc_intr_number;	/* interrupt number */
-	usbd_pipe_handle	sc_intr_pipe;	/* interrupt pipe */
+	int			 sc_intr_number;	/* interrupt number */
+	usbd_pipe_handle	 sc_intr_pipe;	/* interrupt pipe */
 	u_char			*sc_intr_buf;	/* interrupt buffer */
-	int			sc_isize;
+	int			 sc_isize;
 
-	usb_cdc_line_state_t	sc_line_state;	/* current line state */
-	u_char			sc_dtr;		/* current DTR state */
-	u_char			sc_rts;		/* current RTS state */
-	u_char			sc_break;	/* set break */
+	usb_cdc_line_state_t	 sc_line_state;	/* current line state */
+	u_char			 sc_dtr;	/* current DTR state */
+	u_char			 sc_rts;	/* current RTS state */
+	u_char			 sc_break;	/* set break */
 
-	u_char			sc_status;
+	u_char			 sc_status;
 
-	struct device *		sc_subdev;	/* ucom device */
+	struct device		*sc_subdev;	/* ucom device */
 
-	u_char			sc_dying;	/* disconnecting */
+	u_char			 sc_dying;	/* disconnecting */
 
-	u_char			sc_lsr;		/* Local status register */
-	u_char			sc_msr;		/* umct status register */
+	u_char			 sc_lsr;	/* Local status register */
+	u_char			 sc_msr;	/* umct status register */
 
-	u_int			last_lcr;	/* keep lcr register */
+	u_int			 last_lcr;	/* keep lcr register */
 };
 
 /*
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index a6584ab855e..b6e254592d9 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.31 2007/06/12 16:26:36 mbalmer Exp $ */
+/*	$OpenBSD: umodem.c,v 1.32 2007/06/13 06:25:03 mbalmer Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -92,34 +92,34 @@ int	umodemdebug = 0;
 #define UMODEMOBUFSIZE 1024
 
 struct umodem_softc {
-	struct device		sc_dev;		/* base device */
+	struct device		 sc_dev;	/* base device */
 
-	usbd_device_handle	sc_udev;	/* USB device */
+	usbd_device_handle	 sc_udev;	/* USB device */
 
-	int			sc_ctl_iface_no;
-	usbd_interface_handle	sc_ctl_iface;	/* control interface */
-	int			sc_data_iface_no;
-	usbd_interface_handle	sc_data_iface;	/* data interface */
+	int			 sc_ctl_iface_no;
+	usbd_interface_handle	 sc_ctl_iface;	/* control interface */
+	int			 sc_data_iface_no;
+	usbd_interface_handle	 sc_data_iface;	/* data interface */
 
-	int			sc_cm_cap;	/* CM capabilities */
-	int			sc_acm_cap;	/* ACM capabilities */
+	int			 sc_cm_cap;	/* CM capabilities */
+	int			 sc_acm_cap;	/* ACM capabilities */
 
-	int			sc_cm_over_data;
+	int			 sc_cm_over_data;
 
-	usb_cdc_line_state_t	sc_line_state;	/* current line state */
-	u_char			sc_dtr;		/* current DTR state */
-	u_char			sc_rts;		/* current RTS state */
+	usb_cdc_line_state_t	 sc_line_state;	/* current line state */
+	u_char			 sc_dtr;	/* current DTR state */
+	u_char			 sc_rts;	/* current RTS state */
 
-	struct device *		sc_subdev;	/* ucom device */
+	struct device		*sc_subdev;	/* ucom device */
 
-	u_char			sc_opening;	/* lock during open */
-	u_char			sc_dying;	/* disconnecting */
+	u_char			 sc_opening;	/* lock during open */
+	u_char			 sc_dying;	/* disconnecting */
 
-	int			sc_ctl_notify;	/* Notification endpoint */
-	usbd_pipe_handle	sc_notify_pipe; /* Notification pipe */
-	usb_cdc_notification_t	sc_notify_buf;	/* Notification structure */
-	u_char			sc_lsr;		/* Local status register */
-	u_char			sc_msr;		/* Modem status register */
+	int			 sc_ctl_notify;	/* Notification endpoint */
+	usbd_pipe_handle	 sc_notify_pipe; /* Notification pipe */
+	usb_cdc_notification_t	 sc_notify_buf;	/* Notification structure */
+	u_char			 sc_lsr;	/* Local status register */
+	u_char			 sc_msr;	/* Modem status register */
 };
 
 usbd_status umodem_set_comm_feature(struct umodem_softc *sc,
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index a8e8387dc4a..d78c48c1dd5 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.13 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.14 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -36,11 +36,11 @@
 #define UMSM_IFACE_NO	0
 
 struct umsm_softc {
-	struct device		sc_dev;
-	usbd_device_handle	sc_udev;
-	usbd_interface_handle	sc_iface;
-	struct device *		sc_subdev;
-	u_char			sc_dying;
+	struct device		 sc_dev;
+	usbd_device_handle	 sc_udev;
+	usbd_interface_handle	 sc_iface;
+	struct device		*sc_subdev;
+	u_char			 sc_dying;
 };
 
 struct ucom_methods umsm_methods = {
diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c
index 46d5d829a7e..eaa04ce2412 100644
--- a/sys/dev/usb/uow.c
+++ b/sys/dev/usb/uow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uow.c,v 1.21 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: uow.c,v 1.22 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -45,19 +45,19 @@
 #define UOW_TIMEOUT	1000	/* ms */
 
 struct uow_softc {
-	struct device		sc_dev;
-
-	struct onewire_bus	sc_ow_bus;
-	struct device *		sc_ow_dev;
-
-	usbd_device_handle	sc_udev;
-	usbd_interface_handle	sc_iface;
-	usbd_pipe_handle	sc_ph_ibulk;
-	usbd_pipe_handle	sc_ph_obulk;
-	usbd_pipe_handle	sc_ph_intr;
-	u_int8_t		sc_regs[DS2490_NREGS];
-	usbd_xfer_handle	sc_xfer;
-	u_int8_t		sc_fifo[DS2490_DATAFIFOSIZE];
+	struct device		 sc_dev;
+
+	struct onewire_bus	 sc_ow_bus;
+	struct device		*sc_ow_dev;
+
+	usbd_device_handle	 sc_udev;
+	usbd_interface_handle	 sc_iface;
+	usbd_pipe_handle	 sc_ph_ibulk;
+	usbd_pipe_handle	 sc_ph_obulk;
+	usbd_pipe_handle	 sc_ph_intr;
+	u_int8_t		 sc_regs[DS2490_NREGS];
+	usbd_xfer_handle	 sc_xfer;
+	u_int8_t		 sc_fifo[DS2490_DATAFIFOSIZE];
 };
 
 USB_DECLARE_DRIVER(uow);
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 3b400a4ab52..f080af2388b 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.41 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.42 2007/06/13 06:25:03 mbalmer Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -89,28 +89,28 @@ int	uplcomdebug = 0;
 #define RSAQ_STATUS_DCD		0x01
 
 struct	uplcom_softc {
-	struct device		sc_dev;		/* base device */
-	usbd_device_handle	sc_udev;	/* USB device */
-	usbd_interface_handle	sc_iface;	/* interface */
-	int			sc_iface_number;	/* interface number */
-
-	usbd_interface_handle	sc_intr_iface;	/* interrupt interface */
-	int			sc_intr_number;	/* interrupt number */
-	usbd_pipe_handle	sc_intr_pipe;	/* interrupt pipe */
+	struct device		 sc_dev;	/* base device */
+	usbd_device_handle	 sc_udev;	/* USB device */
+	usbd_interface_handle	 sc_iface;	/* interface */
+	int			 sc_iface_number;	/* interface number */
+
+	usbd_interface_handle	 sc_intr_iface;	/* interrupt interface */
+	int			 sc_intr_number;	/* interrupt number */
+	usbd_pipe_handle	 sc_intr_pipe;	/* interrupt pipe */
 	u_char			*sc_intr_buf;	/* interrupt buffer */
-	int			sc_isize;
+	int			 sc_isize;
 
-	usb_cdc_line_state_t	sc_line_state;	/* current line state */
-	int			sc_dtr;		/* current DTR state */
-	int			sc_rts;		/* current RTS state */
+	usb_cdc_line_state_t	 sc_line_state;	/* current line state */
+	int			 sc_dtr;	/* current DTR state */
+	int			 sc_rts;	/* current RTS state */
 
-	struct device *		sc_subdev;	/* ucom device */
+	struct device		*sc_subdev;	/* ucom device */
 
-	u_char			sc_dying;	/* disconnecting */
+	u_char			 sc_dying;	/* disconnecting */
 
-	u_char			sc_lsr;		/* Local status register */
-	u_char			sc_msr;		/* uplcom status register */
-	int			sc_type_hx;	/* HX variant */
+	u_char			 sc_lsr;	/* Local status register */
+	u_char			 sc_msr;	/* uplcom status register */
+	int			 sc_type_hx;	/* HX variant */
 };
 
 /*
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 43006864b9d..4b731848ee8 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.53 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: usb.c,v 1.54 2007/06/13 06:25:03 mbalmer Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -94,13 +94,13 @@ int	usb_noexplore = 0;
 #endif
 
 struct usb_softc {
-	struct device	sc_dev;		/* base device */
-	usbd_bus_handle sc_bus;		/* USB controller */
+	struct device	 sc_dev;	/* base device */
+	usbd_bus_handle  sc_bus;	/* USB controller */
 	struct usbd_port sc_port;	/* dummy port for root hub */
 
-	struct proc *	sc_event_thread;
+	struct proc	*sc_event_thread;
 
-	char		sc_dying;
+	char		 sc_dying;
 };
 
 TAILQ_HEAD(, usb_task) usb_all_tasks;
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 45c538e26d9..ded614dc4dc 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdivar.h,v 1.29 2007/06/12 16:26:37 mbalmer Exp $ */
+/*	$OpenBSD: usbdivar.h,v 1.30 2007/06/13 06:25:03 mbalmer Exp $ */
 /*	$NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $	*/
 
@@ -152,7 +152,7 @@ struct usbd_device {
 	usb_config_descriptor_t *cdesc;	       /* full config descr */
 	const struct usbd_quirks     *quirks;  /* device quirks, always set */
 	struct usbd_hub	       *hub;           /* only if this is a hub */
-	struct device *	       *subdevs;       /* sub-devices, 0 terminated */
+	struct device         **subdevs;       /* sub-devices, 0 terminated */
 };
 
 struct usbd_interface {
@@ -239,15 +239,12 @@ void usbd_dump_pipe(usbd_pipe_handle pipe);
 int		usbctlprint(void *, const char *);
 void		usb_delay_ms(usbd_bus_handle, u_int);
 usbd_status	usbd_reset_port(usbd_device_handle dev,
-				int port, usb_port_status_t *ps);
+		    int port, usb_port_status_t *ps);
 usbd_status	usbd_setup_pipe(usbd_device_handle dev,
-				usbd_interface_handle iface,
-				struct usbd_endpoint *, int,
-				usbd_pipe_handle *pipe);
-usbd_status	usbd_new_device(struct device *parent,
-				usbd_bus_handle bus, int depth,
-				int lowspeed, int port,
-				struct usbd_port *);
+		    usbd_interface_handle iface, struct usbd_endpoint *, int,
+		    usbd_pipe_handle *pipe);
+usbd_status	usbd_new_device(struct device *parent, usbd_bus_handle bus,
+		    int depth, int lowspeed, int port, struct usbd_port *);
 void		usbd_remove_device(usbd_device_handle, struct usbd_port *);
 int		usbd_printBCD(char *cp, size_t len, int bcd);
 usbd_status	usbd_fill_iface_data(usbd_device_handle dev, int i, int a);
diff --git a/sys/dev/usb/usbf.c b/sys/dev/usb/usbf.c
index 6e1a2577ca2..5d8ee5558fc 100644
--- a/sys/dev/usb/usbf.c
+++ b/sys/dev/usb/usbf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbf.c,v 1.7 2007/06/11 16:30:31 mbalmer Exp $	*/
+/*	$OpenBSD: usbf.c,v 1.8 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -72,12 +72,12 @@ int usbfdebug = 0;
 #endif
 
 struct usbf_softc {
-	struct device	 sc_dev;	/* base device */
-	usbf_bus_handle	 sc_bus;	/* USB device controller */
-	struct usbf_port sc_port;	/* dummy port for function */
-	struct proc *	 sc_proc;	/* task thread */
-	TAILQ_HEAD(,usbf_task) sc_tskq;	/* task queue head */
-	int		 sc_dying;
+	struct device	 	 sc_dev;	/* base device */
+	usbf_bus_handle	 	 sc_bus;	/* USB device controller */
+	struct usbf_port 	 sc_port;	/* dummy port for function */
+	struct proc		*sc_proc;	/* task thread */
+	TAILQ_HEAD(,usbf_task)	 sc_tskq;	/* task queue head */
+	int			 sc_dying;
 };
 
 #define DEVNAME(sc)	((sc)->sc_dev.dv_xname)
diff --git a/sys/dev/usb/usbfvar.h b/sys/dev/usb/usbfvar.h
index 79d5d1521aa..9a4e9dc3418 100644
--- a/sys/dev/usb/usbfvar.h
+++ b/sys/dev/usb/usbfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbfvar.h,v 1.4 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: usbfvar.h,v 1.5 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -161,8 +161,8 @@ void	    usbf_do_request(usbf_xfer_handle, usbf_private_handle,
 			    usbf_status);
 
 /* usbf_subr.c */
-usbf_status usbf_new_device(struct device *, usbf_bus_handle, int,
-			    int, int, struct usbf_port *);
+usbf_status usbf_new_device(struct device *, usbf_bus_handle, int, int, int,
+				     struct usbf_port *);
 usbf_status usbf_set_endpoint_feature(usbf_config_handle, u_int8_t,
 				      u_int16_t);
 usbf_status usbf_clear_endpoint_feature(usbf_config_handle, u_int8_t,
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 71a500282f8..7d84b062b41 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uslcom.c,v 1.11 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: uslcom.c,v 1.12 2007/06/13 06:25:03 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -80,15 +80,15 @@ int	uslcomdebug = 0;
 
 
 struct uslcom_softc {
-	struct device		sc_dev;
-	usbd_device_handle	sc_udev;
-	usbd_interface_handle	sc_iface;
-	struct device *		sc_subdev;
+	struct device		 sc_dev;
+	usbd_device_handle	 sc_udev;
+	usbd_interface_handle	 sc_iface;
+	struct device		*sc_subdev;
 
-	u_char			sc_msr;
-	u_char			sc_lsr;
+	u_char			 sc_msr;
+	u_char			 sc_lsr;
 
-	u_char			sc_dying;
+	u_char			 sc_dying;
 };
 
 void	uslcom_get_status(void *, int portno, u_char *lsr, u_char *msr);
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index b7a21fb9617..ce04b68a07d 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usscanner.c,v 1.20 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: usscanner.c,v 1.21 2007/06/13 06:25:03 mbalmer Exp $	*/
 /*	$NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $	*/
 
 /*
@@ -147,7 +147,7 @@ struct usscanner_softc {
 
 	struct scsipi_xfer	*sc_xs;
 
-	struct device *		sc_child;	/* child device, for detach */
+	struct device		*sc_child;	/* child device, for detach */
 
 	struct scsipi_link	sc_link;
 	struct scsi_adapter	sc_atapi_adapter;
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c
index 66eeacfd762..69ec28a80af 100644
--- a/sys/dev/usb/uts.c
+++ b/sys/dev/usb/uts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uts.c,v 1.15 2007/06/12 16:26:37 mbalmer Exp $ */
+/*	$OpenBSD: uts.c,v 1.16 2007/06/13 06:25:03 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> 
@@ -74,7 +74,7 @@ struct uts_softc {
 	int			sc_isize;
 	u_int8_t		sc_pkts;
 
-	struct device *		sc_wsmousedev;
+	struct device		*sc_wsmousedev;
 
 	int	sc_enabled;
 	int	sc_buttons;
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 27ef63d89eb..fe26d17f78d 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvisor.c,v 1.33 2007/06/12 16:26:37 mbalmer Exp $	*/
+/*	$OpenBSD: uvisor.c,v 1.34 2007/06/13 06:25:03 mbalmer Exp $	*/
 /*	$NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $	*/
 
 /*
@@ -141,7 +141,7 @@ struct uvisor_softc {
  */
 	int			sc_vendor;	/* USB device vendor */
 
-	struct device *		sc_subdevs[UVISOR_MAX_CONN];
+	struct device		*sc_subdevs[UVISOR_MAX_CONN];
 	int			sc_numcon;
 
 	u_int16_t		sc_flags;
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index b7507827bcc..e8fac524c5f 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.16 2007/06/12 16:26:37 mbalmer Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.17 2007/06/13 06:25:03 mbalmer Exp $ */
 /*	$NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -151,7 +151,7 @@ struct	uvscom_softc {
 	uint16_t		sc_lcr;		/* Line control */
 	u_char			sc_usr;		/* unit status */
 
-	struct device *		sc_subdev;	/* ucom device */
+	struct device		*sc_subdev;	/* ucom device */
 	u_char			sc_dying;	/* disconnecting */
 };