Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0858a3a52f659dabf2860f350e5a6a61f069e851

Authored by Greg Kroah-Hartman
1 parent 812219ab8f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 14 changed files with 92 additions and 88 deletions Side-by-side Diff

include/linux/usb/atmel_usba_udc.h
Diff comments   View file @ 0858a3a
... ... @@ -15,7 +15,7 @@
15 15  
16 16 struct usba_platform_data {
17 17 int vbus_pin;
18   - int vbus_pin_inverted;
  18 + int vbus_pin_inverted;
19 19 int num_ep;
20 20 struct usba_ep_data ep[0];
21 21 };
include/linux/usb/audio.h
Diff comments   View file @ 0858a3a
... ... @@ -110,7 +110,7 @@
110 110 #define UAC_DT_AC_HEADER_SIZE(n) (8 + (n))
111 111  
112 112 /* As above, but more useful for defining your own descriptors: */
113   -#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n) \
  113 +#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n) \
114 114 struct uac_ac_header_descriptor_v1_##n { \
115 115 __u8 bLength; \
116 116 __u8 bDescriptorType; \
... ... @@ -178,7 +178,7 @@
178 178 #define UAC_DT_FEATURE_UNIT_SIZE(ch) (7 + ((ch) + 1) * 2)
179 179  
180 180 /* As above, but more useful for defining your own descriptors: */
181   -#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch) \
  181 +#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch) \
182 182 struct uac_feature_unit_descriptor_##ch { \
183 183 __u8 bLength; \
184 184 __u8 bDescriptorType; \
... ... @@ -250,7 +250,7 @@
250 250 __u8 tSamFreq[][3];
251 251 } __attribute__ ((packed));
252 252  
253   -#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n) \
  253 +#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n) \
254 254 struct uac_format_type_i_discrete_descriptor_##n { \
255 255 __u8 bLength; \
256 256 __u8 bDescriptorType; \
include/linux/usb/ch9.h
Diff comments   View file @ 0858a3a
... ... @@ -477,7 +477,7 @@
477 477 static inline int usb_endpoint_is_bulk_in(
478 478 const struct usb_endpoint_descriptor *epd)
479 479 {
480   - return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd));
  480 + return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd);
481 481 }
482 482  
483 483 /**
... ... @@ -490,7 +490,7 @@
490 490 static inline int usb_endpoint_is_bulk_out(
491 491 const struct usb_endpoint_descriptor *epd)
492 492 {
493   - return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd));
  493 + return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd);
494 494 }
495 495  
496 496 /**
... ... @@ -503,7 +503,7 @@
503 503 static inline int usb_endpoint_is_int_in(
504 504 const struct usb_endpoint_descriptor *epd)
505 505 {
506   - return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd));
  506 + return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
507 507 }
508 508  
509 509 /**
... ... @@ -516,7 +516,7 @@
516 516 static inline int usb_endpoint_is_int_out(
517 517 const struct usb_endpoint_descriptor *epd)
518 518 {
519   - return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd));
  519 + return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd);
520 520 }
521 521  
522 522 /**
... ... @@ -529,7 +529,7 @@
529 529 static inline int usb_endpoint_is_isoc_in(
530 530 const struct usb_endpoint_descriptor *epd)
531 531 {
532   - return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd));
  532 + return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd);
533 533 }
534 534  
535 535 /**
... ... @@ -542,7 +542,7 @@
542 542 static inline int usb_endpoint_is_isoc_out(
543 543 const struct usb_endpoint_descriptor *epd)
544 544 {
545   - return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd));
  545 + return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
546 546 }
547 547  
548 548 /*-------------------------------------------------------------------------*/
include/linux/usb/ehci_def.h
Diff comments   View file @ 0858a3a
... ... @@ -45,7 +45,7 @@
45 45 #define HCC_CANPARK(p) ((p)&(1 << 2)) /* true: can park on async qh */
46 46 #define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/
47 47 #define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */
48   - u8 portroute [8]; /* nibbles for routing - offset 0xC */
  48 + u8 portroute[8]; /* nibbles for routing - offset 0xC */
49 49 } __attribute__ ((packed));
50 50  
51 51  
52 52  
... ... @@ -92,14 +92,14 @@
92 92 /* ASYNCLISTADDR: offset 0x18 */
93 93 u32 async_next; /* address of next async queue head */
94 94  
95   - u32 reserved [9];
  95 + u32 reserved[9];
96 96  
97 97 /* CONFIGFLAG: offset 0x40 */
98 98 u32 configured_flag;
99 99 #define FLAG_CF (1<<0) /* true: we'll support "high speed" */
100 100  
101 101 /* PORTSC: offset 0x44 */
102   - u32 port_status [0]; /* up to N_PORTS */
  102 + u32 port_status[0]; /* up to N_PORTS */
103 103 /* 31:23 reserved */
104 104 #define PORT_WKOC_E (1<<22) /* wake on overcurrent (enable) */
105 105 #define PORT_WKDISC_E (1<<21) /* wake on disconnect (enable) */
include/linux/usb/gadget.h
Diff comments   View file @ 0858a3a
... ... @@ -500,7 +500,7 @@
500 500 }
501 501  
502 502 /* iterates the non-control endpoints; 'tmp' is a struct usb_ep pointer */
503   -#define gadget_for_each_ep(tmp,gadget) \
  503 +#define gadget_for_each_ep(tmp, gadget) \
504 504 list_for_each_entry(tmp, &(gadget)->ep_list, ep_list)
505 505  
506 506  
include/linux/usb/gadgetfs.h
Diff comments   View file @ 0858a3a
... ... @@ -19,7 +19,7 @@
19 19 #define __LINUX_USB_GADGETFS_H
20 20  
21 21 #include <linux/types.h>
22   -#include <asm/ioctl.h>
  22 +#include <linux/ioctl.h>
23 23  
24 24 #include <linux/usb/ch9.h>
25 25  
include/linux/usb/hcd.h
Diff comments   View file @ 0858a3a
... ... @@ -126,7 +126,7 @@
126 126  
127 127  
128 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 131 int state;
132 132 # define __ACTIVE 0x01
133 133  
... ... @@ -219,12 +219,12 @@
219 219 struct urb *urb, int status);
220 220  
221 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 223 struct usb_host_endpoint *ep);
224 224  
225 225 /* (optional) reset any endpoint state such as sequence number
226 226 and current window */
227   - void (*endpoint_reset)(struct usb_hcd *hcd,
  227 + void (*endpoint_reset)(struct usb_hcd *hcd,
228 228 struct usb_host_endpoint *ep);
229 229  
230 230 /* root hub support */
231 231  
232 232  
... ... @@ -265,16 +265,18 @@
265 265 /* Note that add_endpoint() can only be called once per endpoint before
266 266 * check_bandwidth() or reset_bandwidth() must be called.
267 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
269   - * add the endpoint to the schedule with possibly new parameters denoted by a
270   - * different endpoint descriptor in usb_host_endpoint.
271   - * A call to xhci_add_endpoint() followed by a call to xhci_drop_endpoint() is
272   - * not allowed.
  268 + * A call to xhci_drop_endpoint() followed by a call to
  269 + * xhci_add_endpoint() will add the endpoint to the schedule with
  270 + * possibly new parameters denoted by a different endpoint descriptor
  271 + * in usb_host_endpoint. A call to xhci_add_endpoint() followed by a
  272 + * call to xhci_drop_endpoint() is not allowed.
273 273 */
274 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 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 280 /* Check that a new hardware configuration, set using
279 281 * endpoint_enable and endpoint_disable, does not exceed bus
280 282 * bandwidth. This must be called before any set configuration
... ... @@ -484,8 +486,8 @@
484 486 #define HS_NSECS_ISO(bytes) (((38 * 8 * 2083) \
485 487 + (2083UL * (3 + BitTime(bytes))))/1000 \
486 488 + USB2_HOST_DELAY)
487   -#define HS_USECS(bytes) NS_TO_US (HS_NSECS(bytes))
488   -#define HS_USECS_ISO(bytes) NS_TO_US (HS_NSECS_ISO(bytes))
  489 +#define HS_USECS(bytes) NS_TO_US(HS_NSECS(bytes))
  490 +#define HS_USECS_ISO(bytes) NS_TO_US(HS_NSECS_ISO(bytes))
489 491  
490 492 extern long usb_calc_bus_time(int speed, int is_input,
491 493 int isoc, int bytecount);
... ... @@ -596,7 +598,7 @@
596 598  
597 599 /* hub.h ... DeviceRemovable in 2.4.2-ac11, gone in 2.4.10 */
598 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 /*-------------------------------------------------------------------------*/
include/linux/usb/langwell_udc.h
Diff comments   View file @ 0858a3a
... ... @@ -181,7 +181,7 @@
181 181 #define PORTS_PIC (BIT(15) | BIT(14)) /* port indicator control */
182 182 #define PORTS_PO BIT(13) /* port owner */
183 183 #define PORTS_PP BIT(12) /* port power */
184   -#define PORTS_LS (BIT(11) | BIT(10)) /* line status */
  184 +#define PORTS_LS (BIT(11) | BIT(10)) /* line status */
185 185 #define PORTS_SLP BIT(9) /* suspend using L1 */
186 186 #define PORTS_PR BIT(8) /* port reset */
187 187 #define PORTS_SUSP BIT(7) /* suspend */
include/linux/usb/musb.h
Diff comments   View file @ 0858a3a
... ... @@ -86,8 +86,8 @@
86 86  
87 87 struct musb_hdrc_eps_bits *eps_bits __deprecated;
88 88 #ifdef CONFIG_BLACKFIN
89   - /* A GPIO controlling VRSEL in Blackfin */
90   - unsigned int gpio_vrsel;
  89 + /* A GPIO controlling VRSEL in Blackfin */
  90 + unsigned int gpio_vrsel;
91 91 unsigned int gpio_vrsel_active;
92 92 #endif
93 93  
include/linux/usb/net2280.h
Diff comments   View file @ 0858a3a
... ... @@ -353,7 +353,7 @@
353 353 #define DMA_TRANSACTION_DONE_INTERRUPT 24
354 354 #define DMA_ABORT 1
355 355 #define DMA_START 0
356   - u32 _unused0 [2];
  356 + u32 _unused0[2];
357 357 /* offset 0x0190, 0x01b0, 0x01d0, 0x01f0, */
358 358 u32 dmacount;
359 359 #define VALID_BIT 31
... ... @@ -374,7 +374,7 @@
374 374 u32 dep_cfg;
375 375 /* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */
376 376 u32 dep_rsp;
377   - u32 _unused [2];
  377 + u32 _unused[2];
378 378 } __attribute__ ((packed));
379 379  
380 380 /* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
... ... @@ -437,7 +437,7 @@
437 437 /* offset 0x0310, 0x0330, 0x0350, 0x0370, 0x0390, 0x03b0, 0x03d0 */
438 438 u32 ep_avail;
439 439 u32 ep_data;
440   - u32 _unused0 [2];
  440 + u32 _unused0[2];
441 441 } __attribute__ ((packed));
442 442  
443 443 #endif /* __LINUX_USB_NET2280_H */
include/linux/usb/rndis_host.h
Diff comments   View file @ 0858a3a
... ... @@ -34,10 +34,10 @@
34 34 struct rndis_msg_hdr {
35 35 __le32 msg_type; /* RNDIS_MSG_* */
36 36 __le32 msg_len;
37   - // followed by data that varies between messages
  37 + /* followed by data that varies between messages */
38 38 __le32 request_id;
39 39 __le32 status;
40   - // ... and more
  40 + /* ... and more */
41 41 } __attribute__ ((packed));
42 42  
43 43 /* MS-Windows uses this strange size, but RNDIS spec says 1024 minimum */
44 44  
45 45  
46 46  
47 47  
48 48  
49 49  
50 50  
51 51  
52 52  
53 53  
54 54  
55 55  
56 56  
... ... @@ -92,67 +92,67 @@
92 92  
93 93 struct rndis_data_hdr {
94 94 __le32 msg_type; /* RNDIS_MSG_PACKET */
95   - __le32 msg_len; // rndis_data_hdr + data_len + pad
96   - __le32 data_offset; // 36 -- right after header
97   - __le32 data_len; // ... real packet size
  95 + __le32 msg_len; /* rndis_data_hdr + data_len + pad */
  96 + __le32 data_offset; /* 36 -- right after header */
  97 + __le32 data_len; /* ... real packet size */
98 98  
99   - __le32 oob_data_offset; // zero
100   - __le32 oob_data_len; // zero
101   - __le32 num_oob; // zero
102   - __le32 packet_data_offset; // zero
  99 + __le32 oob_data_offset; /* zero */
  100 + __le32 oob_data_len; /* zero */
  101 + __le32 num_oob; /* zero */
  102 + __le32 packet_data_offset; /* zero */
103 103  
104   - __le32 packet_data_len; // zero
105   - __le32 vc_handle; // zero
106   - __le32 reserved; // zero
  104 + __le32 packet_data_len; /* zero */
  105 + __le32 vc_handle; /* zero */
  106 + __le32 reserved; /* zero */
107 107 } __attribute__ ((packed));
108 108  
109 109 struct rndis_init { /* OUT */
110   - // header and:
  110 + /* header and: */
111 111 __le32 msg_type; /* RNDIS_MSG_INIT */
112   - __le32 msg_len; // 24
  112 + __le32 msg_len; /* 24 */
113 113 __le32 request_id;
114   - __le32 major_version; // of rndis (1.0)
  114 + __le32 major_version; /* of rndis (1.0) */
115 115 __le32 minor_version;
116 116 __le32 max_transfer_size;
117 117 } __attribute__ ((packed));
118 118  
119 119 struct rndis_init_c { /* IN */
120   - // header and:
  120 + /* header and: */
121 121 __le32 msg_type; /* RNDIS_MSG_INIT_C */
122 122 __le32 msg_len;
123 123 __le32 request_id;
124 124 __le32 status;
125   - __le32 major_version; // of rndis (1.0)
  125 + __le32 major_version; /* of rndis (1.0) */
126 126 __le32 minor_version;
127 127 __le32 device_flags;
128   - __le32 medium; // zero == 802.3
  128 + __le32 medium; /* zero == 802.3 */
129 129 __le32 max_packets_per_message;
130 130 __le32 max_transfer_size;
131   - __le32 packet_alignment; // max 7; (1<<n) bytes
132   - __le32 af_list_offset; // zero
133   - __le32 af_list_size; // zero
  131 + __le32 packet_alignment; /* max 7; (1<<n) bytes */
  132 + __le32 af_list_offset; /* zero */
  133 + __le32 af_list_size; /* zero */
134 134 } __attribute__ ((packed));
135 135  
136 136 struct rndis_halt { /* OUT (no reply) */
137   - // header and:
  137 + /* header and: */
138 138 __le32 msg_type; /* RNDIS_MSG_HALT */
139 139 __le32 msg_len;
140 140 __le32 request_id;
141 141 } __attribute__ ((packed));
142 142  
143 143 struct rndis_query { /* OUT */
144   - // header and:
  144 + /* header and: */
145 145 __le32 msg_type; /* RNDIS_MSG_QUERY */
146 146 __le32 msg_len;
147 147 __le32 request_id;
148 148 __le32 oid;
149 149 __le32 len;
150 150 __le32 offset;
151   -/*?*/ __le32 handle; // zero
  151 +/*?*/ __le32 handle; /* zero */
152 152 } __attribute__ ((packed));
153 153  
154 154 struct rndis_query_c { /* IN */
155   - // header and:
  155 + /* header and: */
156 156 __le32 msg_type; /* RNDIS_MSG_QUERY_C */
157 157 __le32 msg_len;
158 158 __le32 request_id;
159 159  
160 160  
... ... @@ -162,18 +162,18 @@
162 162 } __attribute__ ((packed));
163 163  
164 164 struct rndis_set { /* OUT */
165   - // header and:
  165 + /* header and: */
166 166 __le32 msg_type; /* RNDIS_MSG_SET */
167 167 __le32 msg_len;
168 168 __le32 request_id;
169 169 __le32 oid;
170 170 __le32 len;
171 171 __le32 offset;
172   -/*?*/ __le32 handle; // zero
  172 +/*?*/ __le32 handle; /* zero */
173 173 } __attribute__ ((packed));
174 174  
175 175 struct rndis_set_c { /* IN */
176   - // header and:
  176 + /* header and: */
177 177 __le32 msg_type; /* RNDIS_MSG_SET_C */
178 178 __le32 msg_len;
179 179 __le32 request_id;
180 180  
... ... @@ -181,14 +181,14 @@
181 181 } __attribute__ ((packed));
182 182  
183 183 struct rndis_reset { /* IN */
184   - // header and:
  184 + /* header and: */
185 185 __le32 msg_type; /* RNDIS_MSG_RESET */
186 186 __le32 msg_len;
187 187 __le32 reserved;
188 188 } __attribute__ ((packed));
189 189  
190 190 struct rndis_reset_c { /* OUT */
191   - // header and:
  191 + /* header and: */
192 192 __le32 msg_type; /* RNDIS_MSG_RESET_C */
193 193 __le32 msg_len;
194 194 __le32 status;
... ... @@ -196,7 +196,7 @@
196 196 } __attribute__ ((packed));
197 197  
198 198 struct rndis_indicate { /* IN (unrequested) */
199   - // header and:
  199 + /* header and: */
200 200 __le32 msg_type; /* RNDIS_MSG_INDICATE */
201 201 __le32 msg_len;
202 202 __le32 status;
203 203  
... ... @@ -208,14 +208,14 @@
208 208 } __attribute__ ((packed));
209 209  
210 210 struct rndis_keepalive { /* OUT (optionally IN) */
211   - // header and:
  211 + /* header and: */
212 212 __le32 msg_type; /* RNDIS_MSG_KEEPALIVE */
213 213 __le32 msg_len;
214 214 __le32 request_id;
215 215 } __attribute__ ((packed));
216 216  
217 217 struct rndis_keepalive_c { /* IN (optionally OUT) */
218   - // header and:
  218 + /* header and: */
219 219 __le32 msg_type; /* RNDIS_MSG_KEEPALIVE_C */
220 220 __le32 msg_len;
221 221 __le32 request_id;
include/linux/usb/serial.h
Diff comments   View file @ 0858a3a
... ... @@ -52,7 +52,7 @@
52 52 * @interrupt_out_size: the size of the interrupt_out_buffer, in bytes.
53 53 * @interrupt_out_urb: pointer to the interrupt out struct urb for this port.
54 54 * @interrupt_out_endpointAddress: endpoint address for the interrupt out pipe
55   - * for this port.
  55 + * for this port.
56 56 * @bulk_in_buffer: pointer to the bulk in buffer for this port.
57 57 * @bulk_in_size: the size of the bulk_in_buffer, in bytes.
58 58 * @read_urb: pointer to the bulk in struct urb for this port.
include/linux/usb/usbnet.h
Diff comments   View file @ 0858a3a
... ... @@ -43,7 +43,7 @@
43 43 /* protocol/interface state */
44 44 struct net_device *net;
45 45 int msg_enable;
46   - unsigned long data [5];
  46 + unsigned long data[5];
47 47 u32 xid;
48 48 u32 hard_mtu; /* count any extra framing */
49 49 size_t rx_urb_size; /* size for rx urbs */
... ... @@ -148,8 +148,8 @@
148 148 * much everything except custom framing and chip-specific stuff.
149 149 */
150 150 extern int usbnet_probe(struct usb_interface *, const struct usb_device_id *);
151   -extern int usbnet_suspend (struct usb_interface *, pm_message_t );
152   -extern int usbnet_resume (struct usb_interface *);
  151 +extern int usbnet_suspend(struct usb_interface *, pm_message_t);
  152 +extern int usbnet_resume(struct usb_interface *);
153 153 extern void usbnet_disconnect(struct usb_interface *);
154 154  
155 155  
... ... @@ -165,8 +165,8 @@
165 165 struct usb_interface *data;
166 166 };
167 167  
168   -extern int usbnet_generic_cdc_bind (struct usbnet *, struct usb_interface *);
169   -extern void usbnet_cdc_unbind (struct usbnet *, struct usb_interface *);
  168 +extern int usbnet_generic_cdc_bind(struct usbnet *, struct usb_interface *);
  169 +extern void usbnet_cdc_unbind(struct usbnet *, struct usb_interface *);
170 170  
171 171 /* CDC and RNDIS support the same host-chosen packet filters for IN transfers */
172 172 #define DEFAULT_FILTER (USB_CDC_PACKET_TYPE_BROADCAST \
173 173  
174 174  
... ... @@ -189,29 +189,31 @@
189 189 size_t length;
190 190 };
191 191  
192   -extern int usbnet_open (struct net_device *net);
193   -extern int usbnet_stop (struct net_device *net);
194   -extern netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
195   - struct net_device *net);
196   -extern void usbnet_tx_timeout (struct net_device *net);
197   -extern int usbnet_change_mtu (struct net_device *net, int new_mtu);
  192 +extern int usbnet_open(struct net_device *net);
  193 +extern int usbnet_stop(struct net_device *net);
  194 +extern netdev_tx_t usbnet_start_xmit(struct sk_buff *skb,
  195 + struct net_device *net);
  196 +extern void usbnet_tx_timeout(struct net_device *net);
  197 +extern int usbnet_change_mtu(struct net_device *net, int new_mtu);
198 198  
199 199 extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
200 200 extern int usbnet_get_ethernet_addr(struct usbnet *, int);
201   -extern void usbnet_defer_kevent (struct usbnet *, int);
202   -extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
  201 +extern void usbnet_defer_kevent(struct usbnet *, int);
  202 +extern void usbnet_skb_return(struct usbnet *, struct sk_buff *);
203 203 extern void usbnet_unlink_rx_urbs(struct usbnet *);
204 204  
205 205 extern void usbnet_pause_rx(struct usbnet *);
206 206 extern void usbnet_resume_rx(struct usbnet *);
207 207 extern void usbnet_purge_paused_rxq(struct usbnet *);
208 208  
209   -extern int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd);
210   -extern int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd);
211   -extern u32 usbnet_get_link (struct net_device *net);
212   -extern u32 usbnet_get_msglevel (struct net_device *);
213   -extern void usbnet_set_msglevel (struct net_device *, u32);
214   -extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *);
  209 +extern int usbnet_get_settings(struct net_device *net,
  210 + struct ethtool_cmd *cmd);
  211 +extern int usbnet_set_settings(struct net_device *net,
  212 + struct ethtool_cmd *cmd);
  213 +extern u32 usbnet_get_link(struct net_device *net);
  214 +extern u32 usbnet_get_msglevel(struct net_device *);
  215 +extern void usbnet_set_msglevel(struct net_device *, u32);
  216 +extern void usbnet_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
215 217 extern int usbnet_nway_reset(struct net_device *net);
216 218  
217 219 #endif /* __LINUX_USB_USBNET_H */
include/linux/usb/wusb-wa.h
Diff comments   View file @ 0858a3a
... ... @@ -87,7 +87,7 @@
87 87 * FIXME: explain rpipes
88 88 */
89 89 struct usb_rpipe_descriptor {
90   - u8 bLength;
  90 + u8 bLength;
91 91 u8 bDescriptorType;
92 92 __le16 wRPipeIndex;
93 93 __le16 wRequests;