diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-17 13:40:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:47 -0400 |
commit | 812219ab8facf07b94e4b3fe81e9cd3fe4129777 (patch) | |
tree | e7bbdc24a3e6a6c8c9d2bd5343d29883d5189b2f /include/linux/usb.h | |
parent | aa84dfc4296b8dd296da9a4d9e19ec1e6f7ddb94 (diff) |
USB: usb.h: checkpatch cleanups
Minor formatting changes to clean up the file.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 3185eb46d85a..88e854cd6b32 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -65,7 +65,7 @@ struct usb_host_endpoint { | |||
65 | struct usb_ss_ep_comp_descriptor ss_ep_comp; | 65 | struct usb_ss_ep_comp_descriptor ss_ep_comp; |
66 | struct list_head urb_list; | 66 | struct list_head urb_list; |
67 | void *hcpriv; | 67 | void *hcpriv; |
68 | struct ep_device *ep_dev; /* For sysfs info */ | 68 | struct ep_device *ep_dev; /* For sysfs info */ |
69 | 69 | ||
70 | unsigned char *extra; /* Extra descriptors */ | 70 | unsigned char *extra; /* Extra descriptors */ |
71 | int extralen; | 71 | int extralen; |
@@ -96,8 +96,8 @@ enum usb_interface_condition { | |||
96 | /** | 96 | /** |
97 | * struct usb_interface - what usb device drivers talk to | 97 | * struct usb_interface - what usb device drivers talk to |
98 | * @altsetting: array of interface structures, one for each alternate | 98 | * @altsetting: array of interface structures, one for each alternate |
99 | * setting that may be selected. Each one includes a set of | 99 | * setting that may be selected. Each one includes a set of |
100 | * endpoint configurations. They will be in no particular order. | 100 | * endpoint configurations. They will be in no particular order. |
101 | * @cur_altsetting: the current altsetting. | 101 | * @cur_altsetting: the current altsetting. |
102 | * @num_altsetting: number of altsettings defined. | 102 | * @num_altsetting: number of altsettings defined. |
103 | * @intf_assoc: interface association descriptor | 103 | * @intf_assoc: interface association descriptor |
@@ -200,7 +200,7 @@ void usb_put_intf(struct usb_interface *intf); | |||
200 | 200 | ||
201 | /* this maximum is arbitrary */ | 201 | /* this maximum is arbitrary */ |
202 | #define USB_MAXINTERFACES 32 | 202 | #define USB_MAXINTERFACES 32 |
203 | #define USB_MAXIADS USB_MAXINTERFACES/2 | 203 | #define USB_MAXIADS (USB_MAXINTERFACES/2) |
204 | 204 | ||
205 | /** | 205 | /** |
206 | * struct usb_interface_cache - long-term representation of a device interface | 206 | * struct usb_interface_cache - long-term representation of a device interface |
@@ -420,7 +420,7 @@ struct usb_tt; | |||
420 | */ | 420 | */ |
421 | struct usb_device { | 421 | struct usb_device { |
422 | int devnum; | 422 | int devnum; |
423 | char devpath [16]; | 423 | char devpath[16]; |
424 | u32 route; | 424 | u32 route; |
425 | enum usb_device_state state; | 425 | enum usb_device_state state; |
426 | enum usb_device_speed speed; | 426 | enum usb_device_speed speed; |
@@ -453,7 +453,7 @@ struct usb_device { | |||
453 | unsigned persist_enabled:1; | 453 | unsigned persist_enabled:1; |
454 | unsigned have_langid:1; | 454 | unsigned have_langid:1; |
455 | unsigned authorized:1; | 455 | unsigned authorized:1; |
456 | unsigned authenticated:1; | 456 | unsigned authenticated:1; |
457 | unsigned wusb:1; | 457 | unsigned wusb:1; |
458 | int string_langid; | 458 | int string_langid; |
459 | 459 | ||
@@ -664,7 +664,7 @@ static inline int usb_make_path(struct usb_device *dev, char *buf, size_t size) | |||
664 | * This macro is used to create a struct usb_device_id that matches a | 664 | * This macro is used to create a struct usb_device_id that matches a |
665 | * specific device. | 665 | * specific device. |
666 | */ | 666 | */ |
667 | #define USB_DEVICE(vend,prod) \ | 667 | #define USB_DEVICE(vend, prod) \ |
668 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, \ | 668 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, \ |
669 | .idVendor = (vend), \ | 669 | .idVendor = (vend), \ |
670 | .idProduct = (prod) | 670 | .idProduct = (prod) |
@@ -1186,7 +1186,7 @@ struct urb { | |||
1186 | * current owner */ | 1186 | * current owner */ |
1187 | struct list_head anchor_list; /* the URB may be anchored */ | 1187 | struct list_head anchor_list; /* the URB may be anchored */ |
1188 | struct usb_anchor *anchor; | 1188 | struct usb_anchor *anchor; |
1189 | struct usb_device *dev; /* (in) pointer to associated device */ | 1189 | struct usb_device *dev; /* (in) pointer to associated device */ |
1190 | struct usb_host_endpoint *ep; /* (internal) pointer to endpoint */ | 1190 | struct usb_host_endpoint *ep; /* (internal) pointer to endpoint */ |
1191 | unsigned int pipe; /* (in) pipe information */ | 1191 | unsigned int pipe; /* (in) pipe information */ |
1192 | unsigned int stream_id; /* (in) stream ID */ | 1192 | unsigned int stream_id; /* (in) stream ID */ |
@@ -1535,21 +1535,21 @@ static inline unsigned int __create_pipe(struct usb_device *dev, | |||
1535 | } | 1535 | } |
1536 | 1536 | ||
1537 | /* Create various pipes... */ | 1537 | /* Create various pipes... */ |
1538 | #define usb_sndctrlpipe(dev,endpoint) \ | 1538 | #define usb_sndctrlpipe(dev, endpoint) \ |
1539 | ((PIPE_CONTROL << 30) | __create_pipe(dev, endpoint)) | 1539 | ((PIPE_CONTROL << 30) | __create_pipe(dev, endpoint)) |
1540 | #define usb_rcvctrlpipe(dev,endpoint) \ | 1540 | #define usb_rcvctrlpipe(dev, endpoint) \ |
1541 | ((PIPE_CONTROL << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) | 1541 | ((PIPE_CONTROL << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) |
1542 | #define usb_sndisocpipe(dev,endpoint) \ | 1542 | #define usb_sndisocpipe(dev, endpoint) \ |
1543 | ((PIPE_ISOCHRONOUS << 30) | __create_pipe(dev, endpoint)) | 1543 | ((PIPE_ISOCHRONOUS << 30) | __create_pipe(dev, endpoint)) |
1544 | #define usb_rcvisocpipe(dev,endpoint) \ | 1544 | #define usb_rcvisocpipe(dev, endpoint) \ |
1545 | ((PIPE_ISOCHRONOUS << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) | 1545 | ((PIPE_ISOCHRONOUS << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) |
1546 | #define usb_sndbulkpipe(dev,endpoint) \ | 1546 | #define usb_sndbulkpipe(dev, endpoint) \ |
1547 | ((PIPE_BULK << 30) | __create_pipe(dev, endpoint)) | 1547 | ((PIPE_BULK << 30) | __create_pipe(dev, endpoint)) |
1548 | #define usb_rcvbulkpipe(dev,endpoint) \ | 1548 | #define usb_rcvbulkpipe(dev, endpoint) \ |
1549 | ((PIPE_BULK << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) | 1549 | ((PIPE_BULK << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) |
1550 | #define usb_sndintpipe(dev,endpoint) \ | 1550 | #define usb_sndintpipe(dev, endpoint) \ |
1551 | ((PIPE_INTERRUPT << 30) | __create_pipe(dev, endpoint)) | 1551 | ((PIPE_INTERRUPT << 30) | __create_pipe(dev, endpoint)) |
1552 | #define usb_rcvintpipe(dev,endpoint) \ | 1552 | #define usb_rcvintpipe(dev, endpoint) \ |
1553 | ((PIPE_INTERRUPT << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) | 1553 | ((PIPE_INTERRUPT << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN) |
1554 | 1554 | ||
1555 | static inline struct usb_host_endpoint * | 1555 | static inline struct usb_host_endpoint * |