Have some style.

Okay mpi@

1 files changed, 28 insertions, 28 deletions

diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 378dcfe392d..ddcef4524db 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdivar.h,v 1.56 2014/03/08 11:44:17 mpi Exp $ */
+/*	$OpenBSD: usbdivar.h,v 1.57 2014/03/14 14:11:31 pirofti 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 $	*/
 
@@ -54,7 +54,7 @@ struct usbd_endpoint {
 };
 
 struct usbd_bus_methods {
-	usbd_status	      (*open_pipe)(struct usbd_pipe *pipe);
+	usbd_status	      (*open_pipe)(struct usbd_pipe *);
 	void		      (*soft_intr)(void *);
 	void		      (*do_poll)(struct usbd_bus *);
 	struct usbd_xfer *    (*allocx)(struct usbd_bus *);
@@ -62,12 +62,12 @@ struct usbd_bus_methods {
 };
 
 struct usbd_pipe_methods {
-	usbd_status	      (*transfer)(struct usbd_xfer *xfer);
-	usbd_status	      (*start)(struct usbd_xfer *xfer);
-	void		      (*abort)(struct usbd_xfer *xfer);
-	void		      (*close)(struct usbd_pipe *pipe);
-	void		      (*cleartoggle)(struct usbd_pipe *pipe);
-	void		      (*done)(struct usbd_xfer *xfer);
+	usbd_status	      (*transfer)(struct usbd_xfer *);
+	usbd_status	      (*start)(struct usbd_xfer *);
+	void		      (*abort)(struct usbd_xfer *);
+	void		      (*close)(struct usbd_pipe *);
+	void		      (*cleartoggle)(struct usbd_pipe *);
+	void		      (*done)(struct usbd_xfer *);
 };
 
 struct usbd_tt {
@@ -87,7 +87,7 @@ struct usbd_port {
 };
 
 struct usbd_hub {
-	int		      (*explore)(struct usbd_device *hub);
+	int		      (*explore)(struct usbd_device *);
 	void		       *hubsoftc;
 	usb_hub_descriptor_t	hubdesc;
 	struct usbd_port        *ports;
@@ -219,30 +219,30 @@ struct usbd_xfer {
 };
 
 #ifdef USB_DEBUG
-void usbd_dump_iface(struct usbd_interface *iface);
-void usbd_dump_device(struct usbd_device *dev);
-void usbd_dump_endpoint(struct usbd_endpoint *endp);
-void usbd_dump_queue(struct usbd_pipe *pipe);
-void usbd_dump_pipe(struct usbd_pipe *pipe);
+void usbd_dump_iface(struct usbd_interface *);
+void usbd_dump_device(struct usbd_device *);
+void usbd_dump_endpoint(struct usbd_endpoint *);
+void usbd_dump_queue(struct usbd_pipe *);
+void usbd_dump_pipe(struct usbd_pipe *);
 #endif
 
 /* Routines from usb_subr.c */
 int		usbctlprint(void *, const char *);
 void		usb_delay_ms(struct usbd_bus *, u_int);
-usbd_status	usbd_port_disown_to_1_1(struct usbd_device *dev, 
-		    int port, usb_port_status_t *ps);
-usbd_status	usbd_reset_port(struct usbd_device *dev,
-		    int port, usb_port_status_t *ps);
-usbd_status	usbd_setup_pipe(struct usbd_device *dev,
-		    struct usbd_interface *iface, struct usbd_endpoint *, int,
-		    struct usbd_pipe **pipe);
-usbd_status	usbd_new_device(struct device *parent, struct usbd_bus *bus,
-		    int depth, int lowspeed, int port, struct usbd_port *);
-usbd_status	usbd_fill_iface_data(struct usbd_device *dev, int i, int a);
-
-usbd_status	usb_insert_transfer(struct usbd_xfer *xfer);
-void		usb_transfer_complete(struct usbd_xfer *xfer);
-void		usb_disconnect_port(struct usbd_port *up, struct device *);
+usbd_status	usbd_port_disown_to_1_1(struct usbd_device *, 
+		    int, usb_port_status_t *);
+usbd_status	usbd_reset_port(struct usbd_device *,
+		    int, usb_port_status_t *);
+usbd_status	usbd_setup_pipe(struct usbd_device *,
+		    struct usbd_interface *, struct usbd_endpoint *, int,
+		    struct usbd_pipe **);
+usbd_status	usbd_new_device(struct device *, struct usbd_bus *,
+		    int, int, int, struct usbd_port *);
+usbd_status	usbd_fill_iface_data(struct usbd_device *, int, int);
+
+usbd_status	usb_insert_transfer(struct usbd_xfer *);
+void		usb_transfer_complete(struct usbd_xfer *);
+void		usb_disconnect_port(struct usbd_port *, struct device *);
 
 /* Routines from usb.c */
 void		usb_needs_explore(struct usbd_device *, int);