1 files changed, 72 insertions, 57 deletions

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);