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>

diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h
index baf41c8616e930e959d456e28e8cdfac0306e00a..ba99af275a31faab0e7f101eafb67e9443581908 100644 (file)
--- a/include/linux/usb/atmel_usba_udc.h
+++ b/include/linux/usb/atmel_usba_udc.h
@@ -15,7 +15,7 @@ struct usba_ep_data {
 
 struct usba_platform_data {
        int                     vbus_pin;
-       int                     vbus_pin_inverted;
+       int                     vbus_pin_inverted;
        int                     num_ep;
        struct usba_ep_data     ep[0];
 };

diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index 4d3e450e2b03066ea95e5309a211060f28ea69c1..6b892aeadf500e6734830730dc019ef375be3b1e 100644 (file)
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -110,7 +110,7 @@ struct uac_ac_header_descriptor_v1 {
 #define UAC_DT_AC_HEADER_SIZE(n)       (8 + (n))
 
 /* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)                    \
+#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)                    \
 struct uac_ac_header_descriptor_v1_##n {                       \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
@@ -178,7 +178,7 @@ struct uac_output_terminal_descriptor_v1 {
 #define UAC_DT_FEATURE_UNIT_SIZE(ch)           (7 + ((ch) + 1) * 2)
 
 /* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)                \
+#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)                        \
 struct uac_feature_unit_descriptor_##ch {                      \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
@@ -250,7 +250,7 @@ struct uac_format_type_i_discrete_descriptor {
        __u8  tSamFreq[][3];
 } __attribute__ ((packed));
 
-#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)             \
+#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)             \
 struct uac_format_type_i_discrete_descriptor_##n {             \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \

diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index e779af5c800b1f430f6c3243a8b5a6e699ee03d4..da2ed77d3e8d35bf3d0aa023e90b3d266aec3ef2 100644 (file)
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -477,7 +477,7 @@ static inline int usb_endpoint_xfer_isoc(
 static inline int usb_endpoint_is_bulk_in(
                                const struct usb_endpoint_descriptor *epd)
 {
-       return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd));
+       return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd);
 }
 
 /**
@@ -490,7 +490,7 @@ static inline int usb_endpoint_is_bulk_in(
 static inline int usb_endpoint_is_bulk_out(
                                const struct usb_endpoint_descriptor *epd)
 {
-       return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd));
+       return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd);
 }
 
 /**
@@ -503,7 +503,7 @@ static inline int usb_endpoint_is_bulk_out(
 static inline int usb_endpoint_is_int_in(
                                const struct usb_endpoint_descriptor *epd)
 {
-       return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd));
+       return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
 }
 
 /**
@@ -516,7 +516,7 @@ static inline int usb_endpoint_is_int_in(
 static inline int usb_endpoint_is_int_out(
                                const struct usb_endpoint_descriptor *epd)
 {
-       return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd));
+       return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd);
 }
 
 /**
@@ -529,7 +529,7 @@ static inline int usb_endpoint_is_int_out(
 static inline int usb_endpoint_is_isoc_in(
                                const struct usb_endpoint_descriptor *epd)
 {
-       return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd));
+       return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd);
 }
 
 /**
@@ -542,7 +542,7 @@ static inline int usb_endpoint_is_isoc_in(
 static inline int usb_endpoint_is_isoc_out(
                                const struct usb_endpoint_descriptor *epd)
 {
-       return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd));
+       return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
 }
 
 /*-------------------------------------------------------------------------*/

diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index af4b86f3aca374febf7b97542feb8ac8868e4f7a..80287af2a738ab6390afd8bf6c10544d7744c292 100644 (file)
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -45,7 +45,7 @@ struct ehci_caps {
 #define HCC_CANPARK(p)         ((p)&(1 << 2))  /* true: can park on async qh */
 #define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1))  /* true: periodic_size changes*/
 #define HCC_64BIT_ADDR(p)       ((p)&(1))       /* true: can use 64-bit addr */
-       u8              portroute [8];   /* nibbles for routing - offset 0xC */
+       u8              portroute[8];    /* nibbles for routing - offset 0xC */
 } __attribute__ ((packed));
 
 
@@ -92,14 +92,14 @@ struct ehci_regs {
        /* ASYNCLISTADDR: offset 0x18 */
        u32             async_next;     /* address of next async queue head */
 
-       u32             reserved [9];
+       u32             reserved[9];
 
        /* CONFIGFLAG: offset 0x40 */
        u32             configured_flag;
 #define FLAG_CF                (1<<0)          /* true: we'll support "high speed" */
 
        /* PORTSC: offset 0x44 */
-       u32             port_status [0];        /* up to N_PORTS */
+       u32             port_status[0]; /* up to N_PORTS */
 /* 31:23 reserved */
 #define PORT_WKOC_E    (1<<22)         /* wake on overcurrent (enable) */
 #define PORT_WKDISC_E  (1<<21)         /* wake on disconnect (enable) */

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index db6141cdb77be0f3c7e8bd3ca900ded863a8cc4e..d3ef42d7d2f0d02367b42f62bcf1678f97334108 100644 (file)
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -500,7 +500,7 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
 }
 
 /* iterates the non-control endpoints; 'tmp' is a struct usb_ep pointer */
-#define gadget_for_each_ep(tmp,gadget) \
+#define gadget_for_each_ep(tmp, gadget) \
        list_for_each_entry(tmp, &(gadget)->ep_list, ep_list)
 
 

diff --git a/include/linux/usb/gadgetfs.h b/include/linux/usb/gadgetfs.h
index 612102e4d75ea0484da586db87e4cfd1d4ae64f4..0bb12e0d4f8f580da220eff86c6a3f09a9cf3a6b 100644 (file)
--- a/include/linux/usb/gadgetfs.h
+++ b/include/linux/usb/gadgetfs.h
@@ -19,7 +19,7 @@
 #define __LINUX_USB_GADGETFS_H
 
 #include <linux/types.h>
-#include <asm/ioctl.h>
+#include <linux/ioctl.h>
 
 #include <linux/usb/ch9.h>
 

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index aca73a5c3af7ad28ff869db79d5e90ffa7ff12eb..2e3a4ea1a3da77fa39522e022bd4aff9e98059be 100644 (file)
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -126,7 +126,7 @@ struct usb_hcd {
 
 
 #define HCD_BUFFER_POOLS       4
-       struct dma_pool         *pool [HCD_BUFFER_POOLS];
+       struct dma_pool         *pool[HCD_BUFFER_POOLS];
 
        int                     state;
 #      define  __ACTIVE                0x01
@@ -219,12 +219,12 @@ struct hc_driver {
                                struct urb *urb, int status);
 
        /* hw synch, freeing endpoint resources that urb_dequeue can't */
-       void    (*endpoint_disable)(struct usb_hcd *hcd,
+       void    (*endpoint_disable)(struct usb_hcd *hcd,
                        struct usb_host_endpoint *ep);
 
        /* (optional) reset any endpoint state such as sequence number
           and current window */
-       void    (*endpoint_reset)(struct usb_hcd *hcd,
+       void    (*endpoint_reset)(struct usb_hcd *hcd,
                        struct usb_host_endpoint *ep);
 
        /* root hub support */
@@ -265,16 +265,18 @@ struct hc_driver {
        /* Note that add_endpoint() can only be called once per endpoint before
         * check_bandwidth() or reset_bandwidth() must be called.
         * drop_endpoint() can only be called once per endpoint also.
-        * A call to xhci_drop_endpoint() followed by a call to xhci_add_endpoint() will
-        * add the endpoint to the schedule with possibly new parameters denoted by a
-        * different endpoint descriptor in usb_host_endpoint.
-        * A call to xhci_add_endpoint() followed by a call to xhci_drop_endpoint() is
-        * not allowed.
+        * A call to xhci_drop_endpoint() followed by a call to
+        * xhci_add_endpoint() will add the endpoint to the schedule with
+        * possibly new parameters denoted by a different endpoint descriptor
+        * in usb_host_endpoint.  A call to xhci_add_endpoint() followed by a
+        * call to xhci_drop_endpoint() is not allowed.
         */
                /* Allocate endpoint resources and add them to a new schedule */
-       int     (*add_endpoint)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint *);
+       int     (*add_endpoint)(struct usb_hcd *, struct usb_device *,
+                               struct usb_host_endpoint *);
                /* Drop an endpoint from a new schedule */
-       int     (*drop_endpoint)(struct usb_hcd *, struct usb_device *, struct usb_host_endpoint *);
+       int     (*drop_endpoint)(struct usb_hcd *, struct usb_device *,
+                                struct usb_host_endpoint *);
                /* Check that a new hardware configuration, set using
                 * endpoint_enable and endpoint_disable, does not exceed bus
                 * bandwidth.  This must be called before any set configuration
@@ -484,8 +486,8 @@ extern void usb_ep0_reinit(struct usb_device *);
 #define HS_NSECS_ISO(bytes) (((38 * 8 * 2083) \
        + (2083UL * (3 + BitTime(bytes))))/1000 \
        + USB2_HOST_DELAY)
-#define HS_USECS(bytes) NS_TO_US (HS_NSECS(bytes))
-#define HS_USECS_ISO(bytes) NS_TO_US (HS_NSECS_ISO(bytes))
+#define HS_USECS(bytes)                NS_TO_US(HS_NSECS(bytes))
+#define HS_USECS_ISO(bytes)    NS_TO_US(HS_NSECS_ISO(bytes))
 
 extern long usb_calc_bus_time(int speed, int is_input,
                        int isoc, int bytecount);
@@ -596,7 +598,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
 
 /* hub.h ... DeviceRemovable in 2.4.2-ac11, gone in 2.4.10 */
 /* bleech -- resurfaced in 2.4.11 or 2.4.12 */
-#define bitmap         DeviceRemovable
+#define bitmap DeviceRemovable
 
 
 /*-------------------------------------------------------------------------*/

diff --git a/include/linux/usb/langwell_udc.h b/include/linux/usb/langwell_udc.h
index c949178a653023e33322d59ec2616fb2b060018d..2d2d1bbad9d2f728ae8198ced375857cb39ddd7a 100644 (file)
--- a/include/linux/usb/langwell_udc.h
+++ b/include/linux/usb/langwell_udc.h
@@ -181,7 +181,7 @@ struct langwell_op_regs {
 #define        PORTS_PIC       (BIT(15) | BIT(14))     /* port indicator control */
 #define        PORTS_PO        BIT(13) /* port owner */
 #define        PORTS_PP        BIT(12) /* port power */
-#define        PORTS_LS        (BIT(11) | BIT(10))     /* line status */
+#define        PORTS_LS        (BIT(11) | BIT(10))     /* line status */
 #define        PORTS_SLP       BIT(9)  /* suspend using L1 */
 #define        PORTS_PR        BIT(8)  /* port reset */
 #define        PORTS_SUSP      BIT(7)  /* suspend */

diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index fbb83fe21851275cc78a7c2d7a76b84643209dc5..ee2dd1d506ed575cd795963dc8cad50c7aefa419 100644 (file)
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -86,8 +86,8 @@ struct musb_hdrc_config {
 
        struct musb_hdrc_eps_bits *eps_bits __deprecated;
 #ifdef CONFIG_BLACKFIN
-        /* A GPIO controlling VRSEL in Blackfin */
-        unsigned int    gpio_vrsel;
+       /* A GPIO controlling VRSEL in Blackfin */
+       unsigned int    gpio_vrsel;
        unsigned int    gpio_vrsel_active;
 #endif
 

diff --git a/include/linux/usb/net2280.h b/include/linux/usb/net2280.h
index 96ca549a778d62a22897451539efab0189303db0..148b8fa5b1a2be5295fe487b365676dba9f1d371 100644 (file)
--- a/include/linux/usb/net2280.h
+++ b/include/linux/usb/net2280.h
@@ -353,7 +353,7 @@ struct net2280_dma_regs {   /* [11.7] */
 #define     DMA_TRANSACTION_DONE_INTERRUPT                      24
 #define     DMA_ABORT                                           1
 #define     DMA_START                                           0
-       u32             _unused0 [2];
+       u32             _unused0[2];
        /* offset 0x0190, 0x01b0, 0x01d0, 0x01f0, */
        u32             dmacount;
 #define     VALID_BIT                                           31
@@ -374,7 +374,7 @@ struct net2280_dep_regs {   /* [11.8] */
        u32             dep_cfg;
        /* offset 0x0204, 0x0214, 0x224, 0x234, 0x244 */
        u32             dep_rsp;
-       u32             _unused [2];
+       u32             _unused[2];
 } __attribute__ ((packed));
 
 /* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
@@ -437,7 +437,7 @@ struct net2280_ep_regs {    /* [11.9] */
        /* offset 0x0310, 0x0330, 0x0350, 0x0370, 0x0390, 0x03b0, 0x03d0 */
        u32             ep_avail;
        u32             ep_data;
-       u32             _unused0 [2];
+       u32             _unused0[2];
 } __attribute__ ((packed));
 
 #endif /* __LINUX_USB_NET2280_H */

diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
index 1ef1ebc2b04fb1d5fd339dac603cf671972908cf..05ef528619888cd5ec4d73def5fa90078372dc74 100644 (file)
--- a/include/linux/usb/rndis_host.h
+++ b/include/linux/usb/rndis_host.h
@@ -34,10 +34,10 @@
 struct rndis_msg_hdr {
        __le32  msg_type;                       /* RNDIS_MSG_* */
        __le32  msg_len;
-       // followed by data that varies between messages
+       /* followed by data that varies between messages */
        __le32  request_id;
        __le32  status;
-       // ... and more
+       /* ... and more */
 } __attribute__ ((packed));
 
 /* MS-Windows uses this strange size, but RNDIS spec says 1024 minimum */
@@ -92,67 +92,67 @@ struct rndis_msg_hdr {
 
 struct rndis_data_hdr {
        __le32  msg_type;               /* RNDIS_MSG_PACKET */
-       __le32  msg_len;                // rndis_data_hdr + data_len + pad
-       __le32  data_offset;            // 36 -- right after header
-       __le32  data_len;               // ... real packet size
+       __le32  msg_len;                /* rndis_data_hdr + data_len + pad */
+       __le32  data_offset;            /* 36 -- right after header */
+       __le32  data_len;               /* ... real packet size */
 
-       __le32  oob_data_offset;        // zero
-       __le32  oob_data_len;           // zero
-       __le32  num_oob;                // zero
-       __le32  packet_data_offset;     // zero
+       __le32  oob_data_offset;        /* zero */
+       __le32  oob_data_len;           /* zero */
+       __le32  num_oob;                /* zero */
+       __le32  packet_data_offset;     /* zero */
 
-       __le32  packet_data_len;        // zero
-       __le32  vc_handle;              // zero
-       __le32  reserved;               // zero
+       __le32  packet_data_len;        /* zero */
+       __le32  vc_handle;              /* zero */
+       __le32  reserved;               /* zero */
 } __attribute__ ((packed));
 
 struct rndis_init {            /* OUT */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_INIT */
-       __le32  msg_len;                        // 24
+       __le32  msg_len;                        /* 24 */
        __le32  request_id;
-       __le32  major_version;                  // of rndis (1.0)
+       __le32  major_version;                  /* of rndis (1.0) */
        __le32  minor_version;
        __le32  max_transfer_size;
 } __attribute__ ((packed));
 
 struct rndis_init_c {          /* IN */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_INIT_C */
        __le32  msg_len;
        __le32  request_id;
        __le32  status;
-       __le32  major_version;                  // of rndis (1.0)
+       __le32  major_version;                  /* of rndis (1.0) */
        __le32  minor_version;
        __le32  device_flags;
-       __le32  medium;                         // zero == 802.3
+       __le32  medium;                         /* zero == 802.3 */
        __le32  max_packets_per_message;
        __le32  max_transfer_size;
-       __le32  packet_alignment;               // max 7; (1<<n) bytes
-       __le32  af_list_offset;                 // zero
-       __le32  af_list_size;                   // zero
+       __le32  packet_alignment;               /* max 7; (1<<n) bytes */
+       __le32  af_list_offset;                 /* zero */
+       __le32  af_list_size;                   /* zero */
 } __attribute__ ((packed));
 
 struct rndis_halt {            /* OUT (no reply) */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_HALT */
        __le32  msg_len;
        __le32  request_id;
 } __attribute__ ((packed));
 
 struct rndis_query {           /* OUT */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_QUERY */
        __le32  msg_len;
        __le32  request_id;
        __le32  oid;
        __le32  len;
        __le32  offset;
-/*?*/  __le32  handle;                         // zero
+/*?*/  __le32  handle;                         /* zero */
 } __attribute__ ((packed));
 
 struct rndis_query_c {         /* IN */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_QUERY_C */
        __le32  msg_len;
        __le32  request_id;
@@ -162,18 +162,18 @@ struct rndis_query_c {            /* IN */
 } __attribute__ ((packed));
 
 struct rndis_set {             /* OUT */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_SET */
        __le32  msg_len;
        __le32  request_id;
        __le32  oid;
        __le32  len;
        __le32  offset;
-/*?*/  __le32  handle;                         // zero
+/*?*/  __le32  handle;                         /* zero */
 } __attribute__ ((packed));
 
 struct rndis_set_c {           /* IN */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_SET_C */
        __le32  msg_len;
        __le32  request_id;
@@ -181,14 +181,14 @@ struct rndis_set_c {              /* IN */
 } __attribute__ ((packed));
 
 struct rndis_reset {           /* IN */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_RESET */
        __le32  msg_len;
        __le32  reserved;
 } __attribute__ ((packed));
 
 struct rndis_reset_c {         /* OUT */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_RESET_C */
        __le32  msg_len;
        __le32  status;
@@ -196,7 +196,7 @@ struct rndis_reset_c {              /* OUT */
 } __attribute__ ((packed));
 
 struct rndis_indicate {                /* IN (unrequested) */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_INDICATE */
        __le32  msg_len;
        __le32  status;
@@ -208,14 +208,14 @@ struct rndis_indicate {           /* IN (unrequested) */
 } __attribute__ ((packed));
 
 struct rndis_keepalive {       /* OUT (optionally IN) */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_KEEPALIVE */
        __le32  msg_len;
        __le32  request_id;
 } __attribute__ ((packed));
 
 struct rndis_keepalive_c {     /* IN (optionally OUT) */
-       // header and:
+       /* header and: */
        __le32  msg_type;                       /* RNDIS_MSG_KEEPALIVE_C */
        __le32  msg_len;
        __le32  request_id;

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 061c997ae0cfb4af584bc823adca96215c6d16ee..84a4c44c208b78a7eb9602091bc5a1401afdab8d 100644 (file)
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -52,7 +52,7 @@ enum port_dev_state {
  * @interrupt_out_size: the size of the interrupt_out_buffer, in bytes.
  * @interrupt_out_urb: pointer to the interrupt out struct urb for this port.
  * @interrupt_out_endpointAddress: endpoint address for the interrupt out pipe
- *     for this port.
+ *     for this port.
  * @bulk_in_buffer: pointer to the bulk in buffer for this port.
  * @bulk_in_size: the size of the bulk_in_buffer, in bytes.
  * @read_urb: pointer to the bulk in struct urb for this port.

diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index df1e83dd9a5482ce0989e42035306bf9d2dc6413..7ae27a473818ced2a93d84b997a47783504c3e1d 100644 (file)
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -43,7 +43,7 @@ struct usbnet {
        /* protocol/interface state */
        struct net_device       *net;
        int                     msg_enable;
-       unsigned long           data [5];
+       unsigned long           data[5];
        u32                     xid;
        u32                     hard_mtu;       /* count any extra framing */
        size_t                  rx_urb_size;    /* size for rx urbs */
@@ -148,8 +148,8 @@ struct driver_info {
  * much everything except custom framing and chip-specific stuff.
  */
 extern int usbnet_probe(struct usb_interface *, const struct usb_device_id *);
-extern int usbnet_suspend (struct usb_interface *, pm_message_t );
-extern int usbnet_resume (struct usb_interface *);
+extern int usbnet_suspend(struct usb_interface *, pm_message_t);
+extern int usbnet_resume(struct usb_interface *);
 extern void usbnet_disconnect(struct usb_interface *);
 
 
@@ -165,8 +165,8 @@ struct cdc_state {
        struct usb_interface            *data;
 };
 
-extern int usbnet_generic_cdc_bind (struct usbnet *, struct usb_interface *);
-extern void usbnet_cdc_unbind (struct usbnet *, struct usb_interface *);
+extern int usbnet_generic_cdc_bind(struct usbnet *, struct usb_interface *);
+extern void usbnet_cdc_unbind(struct usbnet *, struct usb_interface *);
 
 /* CDC and RNDIS support the same host-chosen packet filters for IN transfers */
 #define        DEFAULT_FILTER  (USB_CDC_PACKET_TYPE_BROADCAST \
@@ -189,29 +189,31 @@ struct skb_data { /* skb->cb is one of these */
        size_t                  length;
 };
 
-extern int usbnet_open (struct net_device *net);
-extern int usbnet_stop (struct net_device *net);
-extern netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
-                                     struct net_device *net);
-extern void usbnet_tx_timeout (struct net_device *net);
-extern int usbnet_change_mtu (struct net_device *net, int new_mtu);
+extern int usbnet_open(struct net_device *net);
+extern int usbnet_stop(struct net_device *net);
+extern netdev_tx_t usbnet_start_xmit(struct sk_buff *skb,
+                                    struct net_device *net);
+extern void usbnet_tx_timeout(struct net_device *net);
+extern int usbnet_change_mtu(struct net_device *net, int new_mtu);
 
 extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
 extern int usbnet_get_ethernet_addr(struct usbnet *, int);
-extern void usbnet_defer_kevent (struct usbnet *, int);
-extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
+extern void usbnet_defer_kevent(struct usbnet *, int);
+extern void usbnet_skb_return(struct usbnet *, struct sk_buff *);
 extern void usbnet_unlink_rx_urbs(struct usbnet *);
 
 extern void usbnet_pause_rx(struct usbnet *);
 extern void usbnet_resume_rx(struct usbnet *);
 extern void usbnet_purge_paused_rxq(struct usbnet *);
 
-extern int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd);
-extern int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd);
-extern u32 usbnet_get_link (struct net_device *net);
-extern u32 usbnet_get_msglevel (struct net_device *);
-extern void usbnet_set_msglevel (struct net_device *, u32);
-extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *);
+extern int usbnet_get_settings(struct net_device *net,
+                              struct ethtool_cmd *cmd);
+extern int usbnet_set_settings(struct net_device *net,
+                              struct ethtool_cmd *cmd);
+extern u32 usbnet_get_link(struct net_device *net);
+extern u32 usbnet_get_msglevel(struct net_device *);
+extern void usbnet_set_msglevel(struct net_device *, u32);
+extern void usbnet_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
 extern int usbnet_nway_reset(struct net_device *net);
 
 #endif /* __LINUX_USB_USBNET_H */

diff --git a/include/linux/usb/wusb-wa.h b/include/linux/usb/wusb-wa.h
index fb7c359bdfba2b26a9cdaf2de3f3b55616f816b5..f9dec37f617bf8c1f4af017e9ac1f55459e23c36 100644 (file)
--- a/include/linux/usb/wusb-wa.h
+++ b/include/linux/usb/wusb-wa.h
@@ -87,7 +87,7 @@ enum rpipe_crs {
  * FIXME: explain rpipes
  */
 struct usb_rpipe_descriptor {
-       u8      bLength;
+       u8      bLength;
        u8      bDescriptorType;
        __le16  wRPipeIndex;
        __le16  wRequests;