6 files changed, 74 insertions, 74 deletions

diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index acd9f00a0b76..cadb2dc1d28a 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -57,8 +57,9 @@ int hcd_buffer_create(struct usb_hcd *hcd)
             !(hcd->driver->flags & HCD_LOCAL_MEM))
                 return 0;
 
-        for (i = 0; i < HCD_BUFFER_POOLS; i++) { 
-                if (!(size = pool_max [i]))
+        for (i = 0; i < HCD_BUFFER_POOLS; i++) {
+                size = pool_max[i];
+                if (!size)
                         continue;
                 snprintf(name, sizeof name, "buffer-%d", size);
                 hcd->pool[i] = dma_pool_create(name, hcd->self.controller,
@@ -81,10 +82,10 @@ int hcd_buffer_create(struct usb_hcd *hcd)
  */
 void hcd_buffer_destroy(struct usb_hcd *hcd)
 {
-        int             i;
+        int i;
 
-        for (i = 0; i < HCD_BUFFER_POOLS; i++) { 
-                struct dma_pool         *pool = hcd->pool[i];
+        for (i = 0; i < HCD_BUFFER_POOLS; i++) {
+                struct dma_pool *pool = hcd->pool[i];
                 if (pool) {
                         dma_pool_destroy(pool);
                         hcd->pool[i] = NULL;
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 1a8edcee7f30..a92122a216bc 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -238,7 +238,7 @@ static int usb_parse_interface(struct device *ddev, int cfgno,
 
         /* Allocate space for the right(?) number of endpoints */
         num_ep = num_ep_orig = alt->desc.bNumEndpoints;
-        alt->desc.bNumEndpoints = 0;            // Use as a counter
+        alt->desc.bNumEndpoints = 0;            /* Use as a counter */
         if (num_ep > USB_MAXENDPOINTS) {
                 dev_warn(ddev, "too many endpoints for config %d interface %d "
                     "altsetting %d: %d, using maximum allowed: %d\n",
@@ -246,7 +246,8 @@ static int usb_parse_interface(struct device *ddev, int cfgno,
                 num_ep = USB_MAXENDPOINTS;
         }
 
-        if (num_ep > 0) {       /* Can't allocate 0 bytes */
+        if (num_ep > 0) {
+                /* Can't allocate 0 bytes */
                 len = sizeof(struct usb_host_endpoint) * num_ep;
                 alt->endpoint = kzalloc(len, GFP_KERNEL);
                 if (!alt->endpoint)
@@ -475,8 +476,9 @@ static int usb_parse_configuration(struct device *ddev, int cfgidx,
         return 0;
 }
 
-// hub-only!! ... and only exported for reset/reinit path.
-// otherwise used internally on disconnect/destroy path
+/* hub-only!! ... and only exported for reset/reinit path.
+ * otherwise used internally on disconnect/destroy path
+ */
 void usb_destroy_configuration(struct usb_device *dev)
 {
         int c, i;
@@ -498,7 +500,7 @@ void usb_destroy_configuration(struct usb_device *dev)
                 kfree(cf->string);
                 for (i = 0; i < cf->desc.bNumInterfaces; i++) {
                         if (cf->intf_cache[i])
-                                kref_put(&cf->intf_cache[i]->ref, 
+                                kref_put(&cf->intf_cache[i]->ref,
                                           usb_release_interface_cache);
                 }
         }
@@ -525,7 +527,7 @@ int usb_get_configuration(struct usb_device *dev)
         unsigned int cfgno, length;
         unsigned char *buffer;
         unsigned char *bigbuffer;
-        struct usb_config_descriptor *desc;
+        struct usb_config_descriptor *desc;
 
         cfgno = 0;
         if (dev->authorized == 0)       /* Not really an error */
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 7e7f2c42494c..801b6f142fa7 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -202,10 +202,10 @@ static int usb_probe_interface(struct device *dev)
         intf = to_usb_interface(dev);
         udev = interface_to_usbdev(intf);
 
-        if (udev->authorized == 0) {
-                dev_err(&intf->dev, "Device is not authorized for usage\n");
-                return -ENODEV;
-        }
+        if (udev->authorized == 0) {
+                dev_err(&intf->dev, "Device is not authorized for usage\n");
+                return -ENODEV;
+        }
 
         id = usb_match_id(intf, driver->id_table);
         if (!id)
@@ -299,7 +299,7 @@ static int usb_unbind_interface(struct device *dev)
  * lock.
  */
 int usb_driver_claim_interface(struct usb_driver *driver,
-                                struct usb_interface *iface, void* priv)
+                                struct usb_interface *iface, void *priv)
 {
         struct device *dev = &iface->dev;
         struct usb_device *udev = interface_to_usbdev(iface);
@@ -398,7 +398,7 @@ int usb_match_device(struct usb_device *dev, const struct usb_device_id *id)
                 return 0;
 
         if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_SUBCLASS) &&
-            (id->bDeviceSubClass!= dev->descriptor.bDeviceSubClass))
+            (id->bDeviceSubClass != dev->descriptor.bDeviceSubClass))
                 return 0;
 
         if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_PROTOCOL) &&
@@ -586,7 +586,7 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
         struct usb_device *usb_dev;
 
         /* driver is often null here; dev_dbg() would oops */
-        pr_debug ("usb %s: uevent\n", dev->bus_id);
+        pr_debug("usb %s: uevent\n", dev->bus_id);
 
         if (is_usb_device(dev))
                 usb_dev = to_usb_device(dev);
@@ -596,11 +596,11 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
         }
 
         if (usb_dev->devnum < 0) {
-                pr_debug ("usb %s: already deleted?\n", dev->bus_id);
+                pr_debug("usb %s: already deleted?\n", dev->bus_id);
                 return -ENODEV;
         }
         if (!usb_dev->bus) {
-                pr_debug ("usb %s: bus removed?\n", dev->bus_id);
+                pr_debug("usb %s: bus removed?\n", dev->bus_id);
                 return -ENODEV;
         }
 
@@ -854,8 +854,10 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
                         dev_err(&intf->dev, "%s error %d\n",
                                         "suspend", status);
         } else {
-                // FIXME else if there's no suspend method, disconnect...
-                // Not possible if auto_pm is set...
+                /*
+                 * FIXME else if there's no suspend method, disconnect...
+                 * Not possible if auto_pm is set...
+                 */
                 dev_warn(&intf->dev, "no suspend for driver %s?\n",
                                 driver->name);
                 mark_quiesced(intf);
@@ -894,7 +896,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
                                 dev_err(&intf->dev, "%s error %d\n",
                                                 "reset_resume", status);
                 } else {
-                        // status = -EOPNOTSUPP;
+                        /* status = -EOPNOTSUPP; */
                         dev_warn(&intf->dev, "no %s for driver %s?\n",
                                         "reset_resume", driver->name);
                 }
@@ -905,7 +907,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
                                 dev_err(&intf->dev, "%s error %d\n",
                                                 "resume", status);
                 } else {
-                        // status = -EOPNOTSUPP;
+                        /* status = -EOPNOTSUPP; */
                         dev_warn(&intf->dev, "no %s for driver %s?\n",
                                         "resume", driver->name);
                 }
@@ -1175,7 +1177,7 @@ static int usb_resume_both(struct usb_device *udev)
                          * so if a root hub's controller is suspended
                          * then we're stuck. */
                         status = usb_resume_device(udev);
-                }
+                }
         } else {
 
                 /* Needed for setting udev->dev.power.power_state.event,
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 021b1d37462c..a37ccbd1e007 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -72,7 +72,7 @@ set_bConfigurationValue(struct device *dev, struct device_attribute *attr,
         return (value < 0) ? value : count;
 }
 
-static DEVICE_ATTR(bConfigurationValue, S_IRUGO | S_IWUSR, 
+static DEVICE_ATTR(bConfigurationValue, S_IRUGO | S_IWUSR,
                 show_bConfigurationValue, set_bConfigurationValue);
 
 /* String fields */
@@ -650,21 +650,21 @@ void usb_remove_sysfs_dev_files(struct usb_device *udev)
 /* Interface Accociation Descriptor fields */
 #define usb_intf_assoc_attr(field, format_string)                       \
 static ssize_t                                                          \
-show_iad_##field (struct device *dev, struct device_attribute *attr,    \
+show_iad_##field(struct device *dev, struct device_attribute *attr,     \
                 char *buf)                                              \
 {                                                                       \
-        struct usb_interface *intf = to_usb_interface (dev);            \
+        struct usb_interface *intf = to_usb_interface(dev);             \
                                                                         \
-        return sprintf (buf, format_string,                             \
-                        intf->intf_assoc->field);               \
+        return sprintf(buf, format_string,                              \
+                        intf->intf_assoc->field);                       \
 }                                                                       \
 static DEVICE_ATTR(iad_##field, S_IRUGO, show_iad_##field, NULL);
 
-usb_intf_assoc_attr (bFirstInterface, "%02x\n")
-usb_intf_assoc_attr (bInterfaceCount, "%02d\n")
-usb_intf_assoc_attr (bFunctionClass, "%02x\n")
-usb_intf_assoc_attr (bFunctionSubClass, "%02x\n")
-usb_intf_assoc_attr (bFunctionProtocol, "%02x\n")
+usb_intf_assoc_attr(bFirstInterface, "%02x\n")
+usb_intf_assoc_attr(bInterfaceCount, "%02d\n")
+usb_intf_assoc_attr(bFunctionClass, "%02x\n")
+usb_intf_assoc_attr(bFunctionSubClass, "%02x\n")
+usb_intf_assoc_attr(bFunctionProtocol, "%02x\n")
 
 /* Interface fields */
 #define usb_intf_attr(field, format_string)                             \
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 0b54dc174e2c..9d7e63292c01 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(usb_free_urb);
  *
  * A pointer to the urb with the incremented reference counter is returned.
  */
-struct urb * usb_get_urb(struct urb *urb)
+struct urb *usb_get_urb(struct urb *urb)
 {
         if (urb)
                 kref_get(&urb->kref);
@@ -176,7 +176,7 @@ EXPORT_SYMBOL_GPL(usb_unanchor_urb);
  * describing that request to the USB subsystem.  Request completion will
  * be indicated later, asynchronously, by calling the completion handler.
  * The three types of completion are success, error, and unlink
- * (a software-induced fault, also called "request cancellation").  
+ * (a software-induced fault, also called "request cancellation").
  *
  * URBs may be submitted in interrupt context.
  *
@@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(usb_unanchor_urb);
  *       semaphores), or
  *   (c) current->state != TASK_RUNNING, this is the case only after
  *       you've changed it.
- * 
+ *
  * GFP_NOIO is used in the block io path and error handling of storage
  * devices.
  *
@@ -288,7 +288,8 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
 
         if (!urb || urb->hcpriv || !urb->complete)
                 return -EINVAL;
-        if (!(dev = urb->dev) || dev->state < USB_STATE_DEFAULT)
+        dev = urb->dev;
+        if ((!dev) || (dev->state < USB_STATE_DEFAULT))
                 return -ENODEV;
 
         /* For now, get the endpoint from the pipe.  Eventually drivers
@@ -351,11 +352,11 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                         max *= mult;
                 }
 
-                if (urb->number_of_packets <= 0)                    
+                if (urb->number_of_packets <= 0)
                         return -EINVAL;
                 for (n = 0; n < urb->number_of_packets; n++) {
                         len = urb->iso_frame_desc[n].length;
-                        if (len < 0 || len > max) 
+                        if (len < 0 || len > max)
                                 return -EMSGSIZE;
                         urb->iso_frame_desc[n].status = -EXDEV;
                         urb->iso_frame_desc[n].actual_length = 0;
@@ -420,7 +421,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                 /* too big? */
                 switch (dev->speed) {
                 case USB_SPEED_HIGH:    /* units are microframes */
-                        // NOTE usb handles 2^15
+                        /* NOTE usb handles 2^15 */
                         if (urb->interval > (1024 * 8))
                                 urb->interval = 1024 * 8;
                         max = 1024 * 8;
@@ -430,12 +431,12 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                         if (xfertype == USB_ENDPOINT_XFER_INT) {
                                 if (urb->interval > 255)
                                         return -EINVAL;
-                                // NOTE ohci only handles up to 32
+                                /* NOTE ohci only handles up to 32 */
                                 max = 128;
                         } else {
                                 if (urb->interval > 1024)
                                         urb->interval = 1024;
-                                // NOTE usb and ohci handle up to 2^15
+                                /* NOTE usb and ohci handle up to 2^15 */
                                 max = 1024;
                         }
                         break;
@@ -574,7 +575,8 @@ void usb_kill_anchored_urbs(struct usb_anchor *anchor)
 
         spin_lock_irq(&anchor->lock);
         while (!list_empty(&anchor->urb_list)) {
-                victim = list_entry(anchor->urb_list.prev, struct urb, anchor_list);
+                victim = list_entry(anchor->urb_list.prev, struct urb,
+                                    anchor_list);
                 /* we must make sure the URB isn't freed before we kill it*/
                 usb_get_urb(victim);
                 spin_unlock_irq(&anchor->lock);
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 8c6319afa757..4e984060c984 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -116,8 +116,9 @@ EXPORT_SYMBOL_GPL(usb_ifnum_to_if);
  * Don't call this function unless you are bound to the intf interface
  * or you have locked the device!
  */
-struct usb_host_interface *usb_altnum_to_altsetting(const struct usb_interface *intf,
-                                                    unsigned int altnum)
+struct usb_host_interface *usb_altnum_to_altsetting(
+                                        const struct usb_interface *intf,
+                                        unsigned int altnum)
 {
         int i;
 
@@ -134,7 +135,7 @@ struct find_interface_arg {
         struct usb_interface *interface;
 };
 
-static int __find_interface(struct device * dev, void * data)
+static int __find_interface(struct device *dev, void *data)
 {
         struct find_interface_arg *arg = data;
         struct usb_interface *intf;
@@ -156,7 +157,7 @@ static int __find_interface(struct device * dev, void * data)
  * @drv: the driver whose current configuration is considered
  * @minor: the minor number of the desired device
  *
- * This walks the driver device list and returns a pointer to the interface 
+ * This walks the driver device list and returns a pointer to the interface
  * with the matching minor.  Note, this only works for devices that share the
  * USB major number.
  */
@@ -272,8 +273,8 @@ static unsigned usb_bus_is_wusb(struct usb_bus *bus)
  *
  * This call may not be used in a non-sleeping context.
  */
-struct usb_device *
-usb_alloc_dev(struct usb_device *parent, struct usb_bus *bus, unsigned port1)
+struct usb_device *usb_alloc_dev(struct usb_device *parent,
+                                 struct usb_bus *bus, unsigned port1)
 {
         struct usb_device *dev;
         struct usb_hcd *usb_hcd = container_of(bus, struct usb_hcd, self);
@@ -469,11 +470,11 @@ int usb_lock_device_for_reset(struct usb_device *udev,
                 return -EHOSTUNREACH;
         if (iface) {
                 switch (iface->condition) {
-                  case USB_INTERFACE_BINDING:
+                case USB_INTERFACE_BINDING:
                         return 0;
-                  case USB_INTERFACE_BOUND:
+                case USB_INTERFACE_BOUND:
                         break;
-                  default:
+                default:
                         return -EINTR;
                 }
         }
@@ -548,10 +549,10 @@ struct usb_device *usb_find_device(u16 vendor_id, u16 product_id)
         struct list_head *buslist;
         struct usb_bus *bus;
         struct usb_device *dev = NULL;
-        
+
         mutex_lock(&usb_bus_list_lock);
         for (buslist = usb_bus_list.next;
-             buslist != &usb_bus_list; 
+             buslist != &usb_bus_list;
              buslist = buslist->next) {
                 bus = container_of(buslist, struct usb_bus, bus_list);
                 if (!bus->root_hub)
@@ -593,7 +594,7 @@ EXPORT_SYMBOL_GPL(usb_get_current_frame_number);
  */
 
 int __usb_get_extra_descriptor(char *buffer, unsigned size,
-        unsigned char type, void **ptr)
+                               unsigned char type, void **ptr)
 {
         struct usb_descriptor_header *header;
 
@@ -604,7 +605,7 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size,
                         printk(KERN_ERR
                                 "%s: bogus descriptor, type %d length %d\n",
                                 usbcore_name,
-                                header->bDescriptorType, 
+                                header->bDescriptorType,
                                 header->bLength);
                         return -1;
                 }
@@ -643,12 +644,8 @@ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
  *
  * When the buffer is no longer used, free it with usb_buffer_free().
  */
-void *usb_buffer_alloc(
-        struct usb_device *dev,
-        size_t size,
-        gfp_t mem_flags,
-        dma_addr_t *dma
-)
+void *usb_buffer_alloc(struct usb_device *dev, size_t size, gfp_t mem_flags,
+                       dma_addr_t *dma)
 {
         if (!dev || !dev->bus)
                 return NULL;
@@ -667,12 +664,8 @@ EXPORT_SYMBOL_GPL(usb_buffer_alloc);
  * been allocated using usb_buffer_alloc(), and the parameters must match
  * those provided in that allocation request.
  */
-void usb_buffer_free(
-        struct usb_device *dev,
-        size_t size,
-        void *addr,
-        dma_addr_t dma
-)
+void usb_buffer_free(struct usb_device *dev, size_t size, void *addr,
+                     dma_addr_t dma)
 {
         if (!dev || !dev->bus)
                 return;
@@ -720,8 +713,8 @@ struct urb *usb_buffer_map(struct urb *urb)
                                         urb->setup_packet,
                                         sizeof(struct usb_ctrlrequest),
                                         DMA_TO_DEVICE);
-        // FIXME generic api broken like pci, can't report errors
-        // if (urb->transfer_dma == DMA_ADDR_INVALID) return 0;
+        /* FIXME generic api broken like pci, can't report errors */
+        /* if (urb->transfer_dma == DMA_ADDR_INVALID) return 0; */
         } else
                 urb->transfer_dma = ~0;
         urb->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP
@@ -843,7 +836,7 @@ int usb_buffer_map_sg(const struct usb_device *dev, int is_in,
                         || !controller->dma_mask)
                 return -1;
 
-        // FIXME generic api broken like pci, can't report errors
+        /* FIXME generic api broken like pci, can't report errors */
         return dma_map_sg(controller, sg, nents,
                         is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
 }
@@ -937,7 +930,7 @@ static int __init usb_init(void)
         if (retval)
                 goto out;
         retval = bus_register(&usb_bus_type);
-        if (retval) 
+        if (retval)
                 goto bus_register_failed;
         retval = usb_host_init();
         if (retval)