WARNING: white space diff

This code reduces the number of trailing white space to be more in line
w/ NetBSD.  I don't regenerate usbdevs, saving that for when it really
changes.

1 files changed, 30 insertions, 31 deletions

diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 3e50efc..8ecc1ac 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -76,7 +76,7 @@ extern int usbdebug;
 #endif
 
 Static usbd_status usbd_ar_pipe(usbd_pipe_handle pipe);
-Static void usbd_do_request_async_cb 
+Static void usbd_do_request_async_cb
 	(usbd_xfer_handle, usbd_private_handle, usbd_status);
 Static void usbd_start_next(usbd_pipe_handle pipe);
 Static usbd_status usbd_open_pipe_ival
@@ -173,18 +173,18 @@ usbd_dump_pipe(usbd_pipe_handle pipe)
 }
 #endif
 
-usbd_status 
+usbd_status
 usbd_open_pipe(usbd_interface_handle iface, u_int8_t address,
 	       u_int8_t flags, usbd_pipe_handle *pipe)
-{ 
-	return (usbd_open_pipe_ival(iface, address, flags, pipe, 
+{
+	return (usbd_open_pipe_ival(iface, address, flags, pipe,
 				    USBD_DEFAULT_INTERVAL));
 }
 
-usbd_status 
+usbd_status
 usbd_open_pipe_ival(usbd_interface_handle iface, u_int8_t address,
 		    u_int8_t flags, usbd_pipe_handle *pipe, int ival)
-{ 
+{
 	usbd_pipe_handle p;
 	struct usbd_endpoint *ep;
 	usbd_status err;
@@ -212,7 +212,7 @@ usbd_open_pipe_ival(usbd_interface_handle iface, u_int8_t address,
 	return (USBD_NORMAL_COMPLETION);
 }
 
-usbd_status 
+usbd_status
 usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address,
 		    u_int8_t flags, usbd_pipe_handle *pipe,
 		    usbd_private_handle priv, void *buffer, u_int32_t len,
@@ -225,7 +225,7 @@ usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address,
 	DPRINTFN(3,("usbd_open_pipe_intr: address=0x%x flags=0x%x len=%d\n",
 		    address, flags, len));
 
-	err = usbd_open_pipe_ival(iface, address, USBD_EXCLUSIVE_USE, 
+	err = usbd_open_pipe_ival(iface, address, USBD_EXCLUSIVE_USE,
 				  &ipipe, ival);
 	if (err)
 		return (err);
@@ -312,7 +312,7 @@ usbd_transfer(usbd_xfer_handle xfer)
 	}
 
 	/* Copy data if going out. */
-	if (!(xfer->flags & USBD_NO_COPY) && size != 0 && 
+	if (!(xfer->flags & USBD_NO_COPY) && size != 0 &&
 	    !usbd_xfer_isread(xfer))
 		memcpy(KERNADDR(dmap, 0), xfer->buffer, size);
 
@@ -390,7 +390,7 @@ usbd_get_buffer(usbd_xfer_handle xfer)
 	return (KERNADDR(&xfer->dmabuf, 0));
 }
 
-usbd_xfer_handle 
+usbd_xfer_handle
 usbd_alloc_xfer(usbd_device_handle dev)
 {
 	usbd_xfer_handle xfer;
@@ -404,7 +404,7 @@ usbd_alloc_xfer(usbd_device_handle dev)
 	return (xfer);
 }
 
-usbd_status 
+usbd_status
 usbd_free_xfer(usbd_xfer_handle xfer)
 {
 	DPRINTFN(5,("usbd_free_xfer: %p\n", xfer));
@@ -531,7 +531,7 @@ usbd_interface2endpoint_descriptor(usbd_interface_handle iface, u_int8_t index)
 	return (iface->endpoints[index].edesc);
 }
 
-usbd_status 
+usbd_status
 usbd_abort_pipe(usbd_pipe_handle pipe)
 {
 	usbd_status err;
@@ -548,8 +548,8 @@ usbd_abort_pipe(usbd_pipe_handle pipe)
 	splx(s);
 	return (err);
 }
-	
-usbd_status 
+
+usbd_status
 usbd_clear_endpoint_stall(usbd_pipe_handle pipe)
 {
 	usbd_device_handle dev = pipe->device;
@@ -558,7 +558,7 @@ usbd_clear_endpoint_stall(usbd_pipe_handle pipe)
 
 	DPRINTFN(8, ("usbd_clear_endpoint_stall\n"));
 
-	/* 
+	/*
 	 * Clearing en endpoint stall resets the endpoint toggle, so
 	 * do the same to the HC toggle.
 	 */
@@ -580,7 +580,7 @@ XXX should we do this?
 	return (err);
 }
 
-usbd_status 
+usbd_status
 usbd_clear_endpoint_stall_async(usbd_pipe_handle pipe)
 {
 	usbd_device_handle dev = pipe->device;
@@ -604,7 +604,7 @@ usbd_clear_endpoint_toggle(usbd_pipe_handle pipe)
 	pipe->methods->cleartoggle(pipe);
 }
 
-usbd_status 
+usbd_status
 usbd_endpoint_count(usbd_interface_handle iface, u_int8_t *count)
 {
 #ifdef DIAGNOSTIC
@@ -617,7 +617,7 @@ usbd_endpoint_count(usbd_interface_handle iface, u_int8_t *count)
 	return (USBD_NORMAL_COMPLETION);
 }
 
-usbd_status 
+usbd_status
 usbd_interface_count(usbd_device_handle dev, u_int8_t *count)
 {
 	if (dev->cdesc == NULL)
@@ -633,7 +633,7 @@ usbd_interface2device_handle(usbd_interface_handle iface,
 	*dev = iface->device;
 }
 
-usbd_status 
+usbd_status
 usbd_device2interface_handle(usbd_device_handle dev,
 			     u_int8_t ifaceno, usbd_interface_handle *iface)
 {
@@ -696,7 +696,7 @@ usbd_get_no_alts(usb_config_descriptor_t *cdesc, int ifaceno)
 
 	for (n = 0; p < end; p += d->bLength) {
 		d = (usb_interface_descriptor_t *)p;
-		if (p + d->bLength <= end && 
+		if (p + d->bLength <= end &&
 		    d->bDescriptorType == UDESC_INTERFACE &&
 		    d->bInterfaceNumber == ifaceno)
 			n++;
@@ -741,7 +741,7 @@ usbd_ar_pipe(usbd_pipe_handle pipe)
 	pipe->repeat = 0;
 	pipe->aborting = 1;
 	while ((xfer = SIMPLEQ_FIRST(&pipe->queue)) != NULL) {
-		DPRINTFN(2,("usbd_ar_pipe: pipe=%p xfer=%p (methods=%p)\n", 
+		DPRINTFN(2,("usbd_ar_pipe: pipe=%p xfer=%p (methods=%p)\n",
 			    pipe, xfer, pipe->methods));
 		/* Make the HC abort it (and invoke the callback). */
 		pipe->methods->abort(xfer);
@@ -764,7 +764,6 @@ usb_transfer_complete(usbd_xfer_handle xfer)
 
 	DPRINTFN(5, ("usb_transfer_complete: pipe=%p xfer=%p status=%d "
 		     "actlen=%d\n", pipe, xfer, xfer->status, xfer->actlen));
-
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_ONQU) {
 		printf("usb_transfer_complete: xfer=%p not busy 0x%08x\n",
@@ -815,7 +814,7 @@ usb_transfer_complete(usbd_xfer_handle xfer)
 #endif
 		SIMPLEQ_REMOVE_HEAD(&pipe->queue, xfer, next);
 	}
-	DPRINTFN(5,("usb_transfer_complete: repeat=%d new head=%p\n", 
+	DPRINTFN(5,("usb_transfer_complete: repeat=%d new head=%p\n",
 		    repeat, SIMPLEQ_FIRST(&pipe->queue)));
 
 	/* Count completed transfers. */
@@ -863,7 +862,7 @@ usb_insert_transfer(usbd_xfer_handle xfer)
 	usbd_status err;
 	int s;
 
-	DPRINTFN(5,("usb_insert_transfer: pipe=%p running=%d timeout=%d\n", 
+	DPRINTFN(5,("usb_insert_transfer: pipe=%p running=%d timeout=%d\n",
 		    pipe, pipe->running, xfer->timeout));
 #ifdef DIAGNOSTIC
 	if (xfer->busy_free != XFER_BUSY) {
@@ -967,14 +966,14 @@ usbd_do_request_flags_pipe(usbd_device_handle dev, usbd_pipe_handle pipe,
 			 "%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
 			 dev->address, xfer->request.bmRequestType,
 			 xfer->request.bRequest, UGETW(xfer->request.wValue),
-			 UGETW(xfer->request.wIndex), 
-			 UGETW(xfer->request.wLength), 
+			 UGETW(xfer->request.wIndex),
+			 UGETW(xfer->request.wLength),
 			 xfer->length, xfer->actlen));
 #endif
 	if (actlen != NULL)
 		*actlen = xfer->actlen;
 	if (err == USBD_STALLED) {
-		/* 
+		/*
 		 * The control endpoint has stalled.  Control endpoints
 		 * should not halt, but some may do so anyway so clear
 		 * any halt condition.
@@ -1024,11 +1023,11 @@ usbd_do_request_async_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
 	if (xfer->actlen > xfer->length)
 		DPRINTF(("usbd_do_request: overrun addr=%d type=0x%02x req=0x"
 			 "%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
-			 xfer->pipe->device->address, 
+			 xfer->pipe->device->address,
 			 xfer->request.bmRequestType,
 			 xfer->request.bRequest, UGETW(xfer->request.wValue),
-			 UGETW(xfer->request.wIndex), 
-			 UGETW(xfer->request.wLength), 
+			 UGETW(xfer->request.wIndex),
+			 UGETW(xfer->request.wLength),
 			 xfer->length, xfer->actlen));
 #endif
 	usbd_free_xfer(xfer);
@@ -1148,7 +1147,7 @@ int
 usbd_driver_load(module_t mod, int what, void *arg)
 {
 	/* XXX should implement something like a function that removes all generic devices */
- 
+
  	return (0);
 }