aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb/hcd.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-05-17 13:58:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 16:21:47 -0400
commit0858a3a52f659dabf2860f350e5a6a61f069e851 (patch)
treecec27991ece5515676d10ea2bc19d6d237cbab36 /include/linux/usb/hcd.h
parent812219ab8facf07b94e4b3fe81e9cd3fe4129777 (diff)
USB: include/usb/*.h checkpatch cleanup
Lots of minor formatting cleanups in includes/usb/ to make checkpatch happier. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb/hcd.h')
-rw-r--r--include/linux/usb/hcd.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index aca73a5c3af7..2e3a4ea1a3da 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -126,7 +126,7 @@ struct usb_hcd {
126 126
127 127
128#define HCD_BUFFER_POOLS 4 128#define HCD_BUFFER_POOLS 4
129 struct dma_pool *pool [HCD_BUFFER_POOLS]; 129 struct dma_pool *pool[HCD_BUFFER_POOLS];
130 130
131 int state; 131 int state;
132# define __ACTIVE 0x01 132# define __ACTIVE 0x01
@@ -219,12 +219,12 @@ struct hc_driver {
219 struct urb *urb, int status); 219 struct urb *urb, int status);
220 220
221 /* hw synch, freeing endpoint resources that urb_dequeue can't */ 221 /* hw synch, freeing endpoint resources that urb_dequeue can't */
222 void (*endpoint_disable)(struct usb_hcd *hcd, 222 void (*endpoint_disable)(struct usb_hcd *hcd,
223 struct usb_host_endpoint *ep); 223 struct usb_host_endpoint *ep);
224 224
225 /* (optional) reset any endpoint state such as sequence number 225 /* (optional) reset any endpoint state such as sequence number
226 and current window */ 226 and current window */
227 void (*endpoint_reset)(struct usb_hcd *hcd, 227 void (*endpoint_reset)(struct usb_hcd *hcd,
228 struct usb_host_endpoint *ep); 228 struct usb_host_endpoint *ep);
229 229
230 /* root hub support */ 230 /* root hub support */
@@ -265,16 +265,18 @@ struct hc_driver {
265 /* Note that add_endpoint() can only be called once per endpoint before 265 /* Note that add_endpoint() can only be called once per endpoint before
266 * check_bandwidth() or reset_bandwidth() must be called. 266 * check_bandwidth() or reset_bandwidth() must be called.
267 * drop_endpoint() can only be called once per endpoint also. 267 * drop_endpoint() can only be called once per endpoint also.
268 * A call to xhci_drop_endpoint() followed by a call to xhci_add_endpoint() will 268 * A call to xhci_drop_endpoint() followed by a call to
269 * add the endpoint to the schedule with possibly new parameters denoted by a 269 * xhci_add_endpoint() will add the endpoint to the schedule with
270 * different endpoint descriptor in usb_host_endpoint. 270 * possibly new parameters denoted by a different endpoint descriptor
271 * A call to xhci_add_endpoint() followed by a call to xhci_drop_endpoint() is 271 * in usb_host_endpoint. A call to xhci_add_endpoint() followed by a
272 * not allowed. 272 * call to xhci_drop_endpoint() is not allowed.
273 */ 273 */
274 /* Allocate endpoint resources and add them to a new schedule */ 274 /* Allocate endpoint resources and add them to a new schedule */
275 int (*add_endpoint)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint *); 275 int (*add_endpoint)(struct usb_hcd *, struct usb_device *,
276 struct usb_host_endpoint *);
276 /* Drop an endpoint from a new schedule */ 277 /* Drop an endpoint from a new schedule */
277 int (*drop_endpoint)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint *); 278 int (*drop_endpoint)(struct usb_hcd *, struct usb_device *,
279 struct usb_host_endpoint *);
278 /* Check that a new hardware configuration, set using 280 /* Check that a new hardware configuration, set using
279 * endpoint_enable and endpoint_disable, does not exceed bus 281 * endpoint_enable and endpoint_disable, does not exceed bus
280 * bandwidth. This must be called before any set configuration 282 * bandwidth. This must be called before any set configuration
@@ -484,8 +486,8 @@ extern void usb_ep0_reinit(struct usb_device *);
484#define HS_NSECS_ISO(bytes) (((38 * 8 * 2083) \ 486#define HS_NSECS_ISO(bytes) (((38 * 8 * 2083) \
485 + (2083UL * (3 + BitTime(bytes))))/1000 \ 487 + (2083UL * (3 + BitTime(bytes))))/1000 \
486 + USB2_HOST_DELAY) 488 + USB2_HOST_DELAY)
487#define HS_USECS(bytes) NS_TO_US (HS_NSECS(bytes)) 489#define HS_USECS(bytes) NS_TO_US(HS_NSECS(bytes))
488#define HS_USECS_ISO(bytes) NS_TO_US (HS_NSECS_ISO(bytes)) 490#define HS_USECS_ISO(bytes) NS_TO_US(HS_NSECS_ISO(bytes))
489 491
490extern long usb_calc_bus_time(int speed, int is_input, 492extern long usb_calc_bus_time(int speed, int is_input,
491 int isoc, int bytecount); 493 int isoc, int bytecount);
@@ -596,7 +598,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
596 598
597/* hub.h ... DeviceRemovable in 2.4.2-ac11, gone in 2.4.10 */ 599/* hub.h ... DeviceRemovable in 2.4.2-ac11, gone in 2.4.10 */
598/* bleech -- resurfaced in 2.4.11 or 2.4.12 */ 600/* bleech -- resurfaced in 2.4.11 or 2.4.12 */
599#define bitmap DeviceRemovable 601#define bitmap DeviceRemovable
600 602
601 603
602/*-------------------------------------------------------------------------*/ 604/*-------------------------------------------------------------------------*/