USB: Remove unneeded void * casts in core files

The patch removes unneeded casts for the following (void *) pointers:
 - struct file: private
 - struct urb: context
 - struct usb_bus: hcpriv
 - return value of kmalloc()

The patch also contains some whitespace cleanup in the relevant areas.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

5 files changed, 12 insertions, 12 deletions

diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index 241d37326ea9..3538c2fdadfe 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -593,7 +593,7 @@ static ssize_t usb_device_read(struct file *file, char __user *buf, size_t nbyte
 /* Kernel lock for "lastev" protection */
 static unsigned int usb_device_poll(struct file *file, struct poll_table_struct *wait)
 {
-        struct usb_device_status *st = (struct usb_device_status *)file->private_data;
+        struct usb_device_status *st = file->private_data;
         unsigned int mask = 0;
 
         lock_kernel();
@@ -603,7 +603,7 @@ static unsigned int usb_device_poll(struct file *file, struct poll_table_struct
                         unlock_kernel();
                         return POLLIN;
                 }
-                
+
                 /* we may have dropped BKL - need to check for having lost the race */
                 if (file->private_data) {
                         kfree(st);
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 71bbd25a4ed0..a94c63bef632 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -122,7 +122,7 @@ static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig)
 
 static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
-        struct dev_state *ps = (struct dev_state *)file->private_data;
+        struct dev_state *ps = file->private_data;
         struct usb_device *dev = ps->dev;
         ssize_t ret = 0;
         unsigned len;
@@ -305,7 +305,7 @@ static void snoop_urb(struct urb *urb, void __user *userurb)
 
 static void async_completed(struct urb *urb, struct pt_regs *regs)
 {
-        struct async *as = (struct async *)urb->context;
+        struct async *as = urb->context;
         struct dev_state *ps = as->ps;
         struct siginfo sinfo;
 
@@ -591,7 +591,7 @@ static int usbdev_open(struct inode *inode, struct file *file)
 
 static int usbdev_release(struct inode *inode, struct file *file)
 {
-        struct dev_state *ps = (struct dev_state *)file->private_data;
+        struct dev_state *ps = file->private_data;
         struct usb_device *dev = ps->dev;
         unsigned int ifnum;
 
@@ -1423,7 +1423,7 @@ static int proc_ioctl_compat(struct dev_state *ps, compat_uptr_t arg)
  */
 static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct dev_state *ps = (struct dev_state *)file->private_data;
+        struct dev_state *ps = file->private_data;
         struct usb_device *dev = ps->dev;
         void __user *p = (void __user *)arg;
         int ret = -ENOTTY;
@@ -1566,8 +1566,8 @@ static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 /* No kernel lock - fine */
 static unsigned int usbdev_poll(struct file *file, struct poll_table_struct *wait)
 {
-        struct dev_state *ps = (struct dev_state *)file->private_data;
-        unsigned int mask = 0;
+        struct dev_state *ps = file->private_data;
+        unsigned int mask = 0;
 
         poll_wait(file, &ps->wait, wait);
         if (file->f_mode & FMODE_WRITE && !list_empty(&ps->async_completed))
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 7479bd329abb..c74baad19b16 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -293,7 +293,7 @@ void usb_kick_khubd(struct usb_device *hdev)
 /* completion function, fires on port status changes and various faults */
 static void hub_irq(struct urb *urb, struct pt_regs *regs)
 {
-        struct usb_hub *hub = (struct usb_hub *)urb->context;
+        struct usb_hub *hub = urb->context;
         int status;
         int i;
         unsigned long bits;
@@ -311,7 +311,7 @@ static void hub_irq(struct urb *urb, struct pt_regs *regs)
                         goto resubmit;
                 hub->error = urb->status;
                 /* FALL THROUGH */
-        
+
         /* let khubd handle things */
         case 0:                 /* we got data:  port status changed */
                 bits = 0;
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 28c6cf225780..85b1cd18336f 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -248,7 +248,7 @@ static void sg_clean (struct usb_sg_request *io)
 
 static void sg_complete (struct urb *urb, struct pt_regs *regs)
 {
-        struct usb_sg_request   *io = (struct usb_sg_request *) urb->context;
+        struct usb_sg_request   *io = urb->context;
 
         spin_lock (&io->lock);
 
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 576919927f53..9801d08edacf 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -57,7 +57,7 @@ struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags)
 {
         struct urb *urb;
 
-        urb = (struct urb *)kmalloc(sizeof(struct urb) + 
+        urb = kmalloc(sizeof(struct urb) +
                 iso_packets * sizeof(struct usb_iso_packet_descriptor),
                 mem_flags);
         if (!urb) {