9 files changed, 108 insertions, 105 deletions

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index a6afd15f6a46..fe858711651c 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -213,7 +213,7 @@ static void adu_interrupt_in_callback(struct urb *urb)
 
         if (urb->actual_length > 0 && dev->interrupt_in_buffer[0] != 0x00) {
                 if (dev->read_buffer_length <
-                    (4 * le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize)) -
+                    (4 * usb_endpoint_maxp(dev->interrupt_in_endpoint)) -
                      (urb->actual_length)) {
                         memcpy (dev->read_buffer_primary +
                                 dev->read_buffer_length,
@@ -315,7 +315,7 @@ static int adu_open(struct inode *inode, struct file *file)
                          usb_rcvintpipe(dev->udev,
                                         dev->interrupt_in_endpoint->bEndpointAddress),
                          dev->interrupt_in_buffer,
-                         le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                         usb_endpoint_maxp(dev->interrupt_in_endpoint),
                          adu_interrupt_in_callback, dev,
                          dev->interrupt_in_endpoint->bInterval);
         dev->read_urb_finished = 0;
@@ -483,7 +483,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
                                                          usb_rcvintpipe(dev->udev,
                                                                         dev->interrupt_in_endpoint->bEndpointAddress),
                                                          dev->interrupt_in_buffer,
-                                                         le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                                                         usb_endpoint_maxp(dev->interrupt_in_endpoint),
                                                          adu_interrupt_in_callback,
                                                          dev,
                                                          dev->interrupt_in_endpoint->bInterval);
@@ -536,7 +536,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
                                  usb_rcvintpipe(dev->udev,
                                                 dev->interrupt_in_endpoint->bEndpointAddress),
                                 dev->interrupt_in_buffer,
-                                le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                                usb_endpoint_maxp(dev->interrupt_in_endpoint),
                                 adu_interrupt_in_callback,
                                 dev,
                                 dev->interrupt_in_endpoint->bInterval);
@@ -622,7 +622,7 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
                         dbg(4," %s : sending, count = %Zd", __func__, count);
 
                         /* write the data into interrupt_out_buffer from userspace */
-                        buffer_size = le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize);
+                        buffer_size = usb_endpoint_maxp(dev->interrupt_out_endpoint);
                         bytes_to_write = count > buffer_size ? buffer_size : count;
                         dbg(4," %s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd",
                             __func__, buffer_size, count, bytes_to_write);
@@ -752,8 +752,8 @@ static int adu_probe(struct usb_interface *interface,
                 goto error;
         }
 
-        in_end_size = le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize);
-        out_end_size = le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize);
+        in_end_size = usb_endpoint_maxp(dev->interrupt_in_endpoint);
+        out_end_size = usb_endpoint_maxp(dev->interrupt_out_endpoint);
 
         dev->read_buffer_primary = kmalloc((4 * in_end_size), GFP_KERNEL);
         if (!dev->read_buffer_primary) {
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 2f41089cd854..2dbe600fbc11 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -2777,7 +2777,7 @@ static int ftdi_elan_probe(struct usb_interface *interface,
                 endpoint = &iface_desc->endpoint[i].desc;
                 if (!ftdi->bulk_in_endpointAddr &&
                     usb_endpoint_is_bulk_in(endpoint)) {
-                        buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                        buffer_size = usb_endpoint_maxp(endpoint);
                         ftdi->bulk_in_size = buffer_size;
                         ftdi->bulk_in_endpointAddr = endpoint->bEndpointAddress;
                         ftdi->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index c6184b4d1695..515b67fffab1 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -359,7 +359,7 @@ static int idmouse_probe(struct usb_interface *interface,
         endpoint = &iface_desc->endpoint[0].desc;
         if (!dev->bulk_in_endpointAddr && usb_endpoint_is_bulk_in(endpoint)) {
                 /* we found a bulk in endpoint */
-                dev->orig_bi_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                dev->orig_bi_size = usb_endpoint_maxp(endpoint);
                 dev->bulk_in_size = 0x200; /* works _much_ faster */
                 dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
                 dev->bulk_in_buffer =
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index a2190b983f52..81457904d6ba 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -803,7 +803,7 @@ static int iowarrior_probe(struct usb_interface *interface,
                         dev->int_out_endpoint = endpoint;
         }
         /* we have to check the report_size often, so remember it in the endianess suitable for our machine */
-        dev->report_size = le16_to_cpu(dev->int_in_endpoint->wMaxPacketSize);
+        dev->report_size = usb_endpoint_maxp(dev->int_in_endpoint);
         if ((dev->interface->cur_altsetting->desc.bInterfaceNumber == 0) &&
             (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56))
                 /* IOWarrior56 has wMaxPacketSize different from report size */
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index cb4096201e29..48c166f0d764 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -721,7 +721,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id *
         if (dev->interrupt_out_endpoint == NULL)
                 dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n");
 
-        dev->interrupt_in_endpoint_size = le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize);
+        dev->interrupt_in_endpoint_size = usb_endpoint_maxp(dev->interrupt_in_endpoint);
         dev->ring_buffer = kmalloc(ring_buffer_size*(sizeof(size_t)+dev->interrupt_in_endpoint_size), GFP_KERNEL);
         if (!dev->ring_buffer) {
                 dev_err(&intf->dev, "Couldn't allocate ring_buffer\n");
@@ -737,7 +737,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id *
                 dev_err(&intf->dev, "Couldn't allocate interrupt_in_urb\n");
                 goto error;
         }
-        dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? le16_to_cpu(dev->interrupt_out_endpoint->wMaxPacketSize) :
+        dev->interrupt_out_endpoint_size = dev->interrupt_out_endpoint ? usb_endpoint_maxp(dev->interrupt_out_endpoint) :
                                                                          udev->descriptor.bMaxPacketSize0;
         dev->interrupt_out_buffer = kmalloc(write_buffer_size*dev->interrupt_out_endpoint_size, GFP_KERNEL);
         if (!dev->interrupt_out_buffer) {
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 6482c6e2e6bd..a989356f693e 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -409,7 +409,7 @@ static int tower_open (struct inode *inode, struct file *file)
                           dev->udev,
                           usb_rcvintpipe(dev->udev, dev->interrupt_in_endpoint->bEndpointAddress),
                           dev->interrupt_in_buffer,
-                          le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                          usb_endpoint_maxp(dev->interrupt_in_endpoint),
                           tower_interrupt_in_callback,
                           dev,
                           dev->interrupt_in_interval);
@@ -928,7 +928,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
                 err("Couldn't allocate read_buffer");
                 goto error;
         }
-        dev->interrupt_in_buffer = kmalloc (le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize), GFP_KERNEL);
+        dev->interrupt_in_buffer = kmalloc (usb_endpoint_maxp(dev->interrupt_in_endpoint), GFP_KERNEL);
         if (!dev->interrupt_in_buffer) {
                 err("Couldn't allocate interrupt_in_buffer");
                 goto error;
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index 51648154bb44..1871cdf10da3 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/usb.h>
 
 #define DRIVER_VERSION "USBLCD Driver Version 1.05"
@@ -34,22 +34,29 @@ static const struct usb_device_id id_table[] = {
         { .idVendor = 0x10D2, .match_flags = USB_DEVICE_ID_MATCH_VENDOR, },
         { },
 };
-MODULE_DEVICE_TABLE (usb, id_table);
+MODULE_DEVICE_TABLE(usb, id_table);
 
 static DEFINE_MUTEX(open_disc_mutex);
 
 
 struct usb_lcd {
-        struct usb_device *     udev;                   /* init: probe_lcd */
-        struct usb_interface *  interface;              /* the interface for this device */
-        unsigned char *         bulk_in_buffer;         /* the buffer to receive data */
-        size_t                  bulk_in_size;           /* the size of the receive buffer */
-        __u8                    bulk_in_endpointAddr;   /* the address of the bulk in endpoint */
-        __u8                    bulk_out_endpointAddr;  /* the address of the bulk out endpoint */
+        struct usb_device       *udev;                  /* init: probe_lcd */
+        struct usb_interface    *interface;             /* the interface for
+                                                           this device */
+        unsigned char           *bulk_in_buffer;        /* the buffer to receive
+                                                           data */
+        size_t                  bulk_in_size;           /* the size of the
+                                                           receive buffer */
+        __u8                    bulk_in_endpointAddr;   /* the address of the
+                                                           bulk in endpoint */
+        __u8                    bulk_out_endpointAddr;  /* the address of the
+                                                           bulk out endpoint */
         struct kref             kref;
-        struct semaphore        limit_sem;              /* to stop writes at full throttle from
-                                                         * using up all RAM */
-        struct usb_anchor       submitted;              /* URBs to wait for before suspend */
+        struct semaphore        limit_sem;              /* to stop writes at
+                                                           full throttle from
+                                                           using up all RAM */
+        struct usb_anchor       submitted;              /* URBs to wait for
+                                                           before suspend */
 };
 #define to_lcd_dev(d) container_of(d, struct usb_lcd, kref)
 
@@ -63,8 +70,8 @@ static void lcd_delete(struct kref *kref)
         struct usb_lcd *dev = to_lcd_dev(kref);
 
         usb_put_dev(dev->udev);
-        kfree (dev->bulk_in_buffer);
-        kfree (dev);
+        kfree(dev->bulk_in_buffer);
+        kfree(dev);
 }
 
 
@@ -80,7 +87,7 @@ static int lcd_open(struct inode *inode, struct file *file)
         interface = usb_find_interface(&lcd_driver, subminor);
         if (!interface) {
                 mutex_unlock(&lcd_mutex);
-                err ("USBLCD: %s - error, can't find device for minor %d",
+                err("USBLCD: %s - error, can't find device for minor %d",
                      __func__, subminor);
                 return -ENODEV;
         }
@@ -126,7 +133,8 @@ static int lcd_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static ssize_t lcd_read(struct file *file, char __user * buffer, size_t count, loff_t *ppos)
+static ssize_t lcd_read(struct file *file, char __user * buffer,
+                        size_t count, loff_t *ppos)
 {
         struct usb_lcd *dev;
         int retval = 0;
@@ -135,8 +143,9 @@ static ssize_t lcd_read(struct file *file, char __user * buffer, size_t count, l
         dev = file->private_data;
 
         /* do a blocking bulk read to get data from the device */
-        retval = usb_bulk_msg(dev->udev, 
-                              usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr),
+        retval = usb_bulk_msg(dev->udev,
+                              usb_rcvbulkpipe(dev->udev,
+                                              dev->bulk_in_endpointAddr),
                               dev->bulk_in_buffer,
                               min(dev->bulk_in_size, count),
                               &bytes_read, 10000);
@@ -161,23 +170,23 @@ static long lcd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         dev = file->private_data;
         if (dev == NULL)
                 return -ENODEV;
-        
+
         switch (cmd) {
         case IOCTL_GET_HARD_VERSION:
                 mutex_lock(&lcd_mutex);
                 bcdDevice = le16_to_cpu((dev->udev)->descriptor.bcdDevice);
-                sprintf(buf,"%1d%1d.%1d%1d",
+                sprintf(buf, "%1d%1d.%1d%1d",
                         (bcdDevice & 0xF000)>>12,
                         (bcdDevice & 0xF00)>>8,
                         (bcdDevice & 0xF0)>>4,
                         (bcdDevice & 0xF));
                 mutex_unlock(&lcd_mutex);
-                if (copy_to_user((void __user *)arg,buf,strlen(buf))!=0)
+                if (copy_to_user((void __user *)arg, buf, strlen(buf)) != 0)
                         return -EFAULT;
                 break;
         case IOCTL_GET_DRV_VERSION:
-                sprintf(buf,DRIVER_VERSION);
-                if (copy_to_user((void __user *)arg,buf,strlen(buf))!=0)
+                sprintf(buf, DRIVER_VERSION);
+                if (copy_to_user((void __user *)arg, buf, strlen(buf)) != 0)
                         return -EFAULT;
                 break;
         default:
@@ -199,7 +208,7 @@ static void lcd_write_bulk_callback(struct urb *urb)
         if (status &&
             !(status == -ENOENT ||
               status == -ECONNRESET ||
-              status == -ESHUTDOWN)) {
+              status == -ESHUTDOWN)) {
                 dbg("USBLCD: %s - nonzero write bulk status received: %d",
                     __func__, status);
         }
@@ -210,15 +219,16 @@ static void lcd_write_bulk_callback(struct urb *urb)
         up(&dev->limit_sem);
 }
 
-static ssize_t lcd_write(struct file *file, const char __user * user_buffer, size_t count, loff_t *ppos)
+static ssize_t lcd_write(struct file *file, const char __user * user_buffer,
+                         size_t count, loff_t *ppos)
 {
         struct usb_lcd *dev;
-        int retval = 0, r;
+        int retval = 0, r;
         struct urb *urb = NULL;
         char *buf = NULL;
-        
+
         dev = file->private_data;
-        
+
         /* verify that we actually have some data to write */
         if (count == 0)
                 goto exit;
@@ -233,34 +243,38 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, siz
                 retval = -ENOMEM;
                 goto err_no_buf;
         }
-        
-        buf = usb_alloc_coherent(dev->udev, count, GFP_KERNEL, &urb->transfer_dma);
+
+        buf = usb_alloc_coherent(dev->udev, count, GFP_KERNEL,
+                                 &urb->transfer_dma);
         if (!buf) {
                 retval = -ENOMEM;
                 goto error;
         }
-        
+
         if (copy_from_user(buf, user_buffer, count)) {
                 retval = -EFAULT;
                 goto error;
         }
-        
+
         /* initialize the urb properly */
         usb_fill_bulk_urb(urb, dev->udev,
-                          usb_sndbulkpipe(dev->udev, dev->bulk_out_endpointAddr),
+                          usb_sndbulkpipe(dev->udev,
+                          dev->bulk_out_endpointAddr),
                           buf, count, lcd_write_bulk_callback, dev);
         urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
         usb_anchor_urb(urb, &dev->submitted);
-        
+
         /* send the data out the bulk port */
         retval = usb_submit_urb(urb, GFP_KERNEL);
         if (retval) {
-                err("USBLCD: %s - failed submitting write urb, error %d", __func__, retval);
+                err("USBLCD: %s - failed submitting write urb, error %d",
+                    __func__, retval);
                 goto error_unanchor;
         }
-        
-        /* release our reference to this urb, the USB core will eventually free it entirely */
+
+        /* release our reference to this urb,
+           the USB core will eventually free it entirely */
         usb_free_urb(urb);
 
 exit:
@@ -276,13 +290,13 @@ err_no_buf:
 }
 
 static const struct file_operations lcd_fops = {
-        .owner =        THIS_MODULE,
-        .read =         lcd_read,
-        .write =        lcd_write,
-        .open =         lcd_open,
+        .owner =        THIS_MODULE,
+        .read =         lcd_read,
+        .write =        lcd_write,
+        .open =         lcd_open,
         .unlocked_ioctl = lcd_ioctl,
-        .release =      lcd_release,
-        .llseek =        noop_llseek,
+        .release =      lcd_release,
+        .llseek =        noop_llseek,
 };
 
 /*
@@ -290,12 +304,13 @@ static const struct file_operations lcd_fops = {
  * and to have the device registered with the driver core
  */
 static struct usb_class_driver lcd_class = {
-        .name =         "lcd%d",
-        .fops =         &lcd_fops,
-        .minor_base =   USBLCD_MINOR,
+        .name =         "lcd%d",
+        .fops =         &lcd_fops,
+        .minor_base =   USBLCD_MINOR,
 };
 
-static int lcd_probe(struct usb_interface *interface, const struct usb_device_id *id)
+static int lcd_probe(struct usb_interface *interface,
+                     const struct usb_device_id *id)
 {
         struct usb_lcd *dev = NULL;
         struct usb_host_interface *iface_desc;
@@ -322,7 +337,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
                 retval = -ENODEV;
                 goto error;
         }
-        
+
         /* set up the endpoint information */
         /* use only the first bulk-in and bulk-out endpoints */
         iface_desc = interface->cur_altsetting;
@@ -332,7 +347,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
                 if (!dev->bulk_in_endpointAddr &&
                     usb_endpoint_is_bulk_in(endpoint)) {
                         /* we found a bulk in endpoint */
-                        buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                        buffer_size = usb_endpoint_maxp(endpoint);
                         dev->bulk_in_size = buffer_size;
                         dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
                         dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
@@ -369,7 +384,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
 
         dev_info(&interface->dev, "USBLCD Version %1d%1d.%1d%1d found "
                  "at address %d\n", (i & 0xF000)>>12, (i & 0xF00)>>8,
-                 (i & 0xF0)>>4,(i & 0xF), dev->udev->devnum);
+                 (i & 0xF0)>>4, (i & 0xF), dev->udev->devnum);
 
         /* let the user know what node this device is now attached to */
         dev_info(&interface->dev, "USB LCD device now attached to USBLCD-%d\n",
@@ -401,7 +416,7 @@ static int lcd_suspend(struct usb_interface *intf, pm_message_t message)
         return 0;
 }
 
-static int lcd_resume (struct usb_interface *intf)
+static int lcd_resume(struct usb_interface *intf)
 {
         return 0;
 }
@@ -409,16 +424,16 @@ static int lcd_resume (struct usb_interface *intf)
 static void lcd_disconnect(struct usb_interface *interface)
 {
         struct usb_lcd *dev;
-        int minor = interface->minor;
+        int minor = interface->minor;
 
         mutex_lock(&open_disc_mutex);
-        dev = usb_get_intfdata(interface);
-        usb_set_intfdata(interface, NULL);
+        dev = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
         mutex_unlock(&open_disc_mutex);
 
-        /* give back our minor */
-        usb_deregister_dev(interface, &lcd_class);
- 
+        /* give back our minor */
+        usb_deregister_dev(interface, &lcd_class);
+
         /* decrement our usage count */
         kref_put(&dev->kref, lcd_delete);
 
@@ -438,7 +453,7 @@ static struct usb_driver lcd_driver = {
 static int __init usb_lcd_init(void)
 {
         int result;
-        
+
         result = usb_register(&lcd_driver);
         if (result)
                 err("usb_register failed. Error number %d", result);
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index 1616ad1793a4..43f84e50d514 100644
--- a/drivers/usb/misc/usbled.c
+++ b/drivers/usb/misc/usbled.c
@@ -33,10 +33,10 @@ static const struct usb_device_id id_table[] = {
                         .driver_info = DREAM_CHEEKY_WEBMAIL_NOTIFIER },
         { },
 };
-MODULE_DEVICE_TABLE (usb, id_table);
+MODULE_DEVICE_TABLE(usb, id_table);
 
 struct usb_led {
-        struct usb_device *     udev;
+        struct usb_device       *udev;
         unsigned char           blue;
         unsigned char           red;
         unsigned char           green;
@@ -113,14 +113,16 @@ static void change_color(struct usb_led *led)
 }
 
 #define show_set(value) \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr,\
+                            char *buf)                                  \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct usb_led *led = usb_get_intfdata(intf);                   \
                                                                         \
         return sprintf(buf, "%d\n", led->value);                        \
 }                                                                       \
-static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr,\
+                           const char *buf, size_t count)               \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct usb_led *led = usb_get_intfdata(intf);                   \
@@ -135,7 +137,8 @@ show_set(blue);
 show_set(red);
 show_set(green);
 
-static int led_probe(struct usb_interface *interface, const struct usb_device_id *id)
+static int led_probe(struct usb_interface *interface,
+                     const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev(interface);
         struct usb_led *dev = NULL;
@@ -150,7 +153,7 @@ static int led_probe(struct usb_interface *interface, const struct usb_device_id
         dev->udev = usb_get_dev(udev);
         dev->type = id->driver_info;
 
-        usb_set_intfdata (interface, dev);
+        usb_set_intfdata(interface, dev);
 
         retval = device_create_file(&interface->dev, &dev_attr_blue);
         if (retval)
@@ -194,7 +197,7 @@ error:
         device_remove_file(&interface->dev, &dev_attr_blue);
         device_remove_file(&interface->dev, &dev_attr_red);
         device_remove_file(&interface->dev, &dev_attr_green);
-        usb_set_intfdata (interface, NULL);
+        usb_set_intfdata(interface, NULL);
         usb_put_dev(dev->udev);
         kfree(dev);
 error_mem:
@@ -205,14 +208,14 @@ static void led_disconnect(struct usb_interface *interface)
 {
         struct usb_led *dev;
 
-        dev = usb_get_intfdata (interface);
+        dev = usb_get_intfdata(interface);
 
         device_remove_file(&interface->dev, &dev_attr_blue);
         device_remove_file(&interface->dev, &dev_attr_red);
         device_remove_file(&interface->dev, &dev_attr_green);
 
         /* first remove the files, then set the pointer to NULL */
-        usb_set_intfdata (interface, NULL);
+        usb_set_intfdata(interface, NULL);
 
         usb_put_dev(dev->udev);
 
@@ -243,8 +246,8 @@ static void __exit usb_led_exit(void)
         usb_deregister(&led_driver);
 }
 
-module_init (usb_led_init);
-module_exit (usb_led_exit);
+module_init(usb_led_init);
+module_exit(usb_led_exit);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index bb10846affc3..bd6d00802eab 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -359,8 +359,10 @@ static int simple_io(
         urb->context = &completion;
         while (retval == 0 && iterations-- > 0) {
                 init_completion(&completion);
-                if (usb_pipeout(urb->pipe))
+                if (usb_pipeout(urb->pipe)) {
                         simple_fill_buf(urb);
+                        urb->transfer_flags |= URB_ZERO_PACKET;
+                }
                 retval = usb_submit_urb(urb, GFP_KERNEL);
                 if (retval != 0)
                         break;
@@ -1583,8 +1585,8 @@ static struct urb *iso_alloc_urb(
 
         if (bytes < 0 || !desc)
                 return NULL;
-        maxp = 0x7ff & le16_to_cpu(desc->wMaxPacketSize);
-        maxp *= 1 + (0x3 & (le16_to_cpu(desc->wMaxPacketSize) >> 11));
+        maxp = 0x7ff & usb_endpoint_maxp(desc);
+        maxp *= 1 + (0x3 & (usb_endpoint_maxp(desc) >> 11));
         packets = DIV_ROUND_UP(bytes, maxp);
 
         urb = usb_alloc_urb(packets, GFP_KERNEL);
@@ -1654,7 +1656,7 @@ test_iso_queue(struct usbtest_dev *dev, struct usbtest_param *param,
                 "... iso period %d %sframes, wMaxPacket %04x\n",
                 1 << (desc->bInterval - 1),
                 (udev->speed == USB_SPEED_HIGH) ? "micro" : "",
-                le16_to_cpu(desc->wMaxPacketSize));
+                usb_endpoint_maxp(desc));
 
         for (i = 0; i < param->sglen; i++) {
                 urbs[i] = iso_alloc_urb(udev, pipe, desc,
@@ -2298,25 +2300,8 @@ usbtest_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         usb_set_intfdata(intf, dev);
         dev_info(&intf->dev, "%s\n", info->name);
-        dev_info(&intf->dev, "%s speed {control%s%s%s%s%s} tests%s\n",
-                        ({ char *tmp;
-                        switch (udev->speed) {
-                        case USB_SPEED_LOW:
-                                tmp = "low";
-                                break;
-                        case USB_SPEED_FULL:
-                                tmp = "full";
-                                break;
-                        case USB_SPEED_HIGH:
-                                tmp = "high";
-                                break;
-                        case USB_SPEED_SUPER:
-                                tmp = "super";
-                                break;
-                        default:
-                                tmp = "unknown";
-                                break;
-                        }; tmp; }),
+        dev_info(&intf->dev, "%s {control%s%s%s%s%s} tests%s\n",
+                        usb_speed_string(udev->speed),
                         info->ctrl_out ? " in/out" : "",
                         rtest, wtest,
                         irtest, iwtest,