Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / usb / usb-skeleton.c

diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index d110588..552679b 100644 (file)
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -142,7 +142,7 @@ static int skel_release(struct inode *inode, struct file *file)
 {
        struct usb_skel *dev;
 
-       dev = (struct usb_skel *)file->private_data;
+       dev = file->private_data;
        if (dev == NULL)
                return -ENODEV;
 
@@ -162,7 +162,7 @@ static int skel_flush(struct file *file, fl_owner_t id)
        struct usb_skel *dev;
        int res;
 
-       dev = (struct usb_skel *)file->private_data;
+       dev = file->private_data;
        if (dev == NULL)
                return -ENODEV;
 
@@ -246,7 +246,7 @@ static ssize_t skel_read(struct file *file, char *buffer, size_t count,
        int rv;
        bool ongoing_io;
 
-       dev = (struct usb_skel *)file->private_data;
+       dev = file->private_data;
 
        /* if we cannot read at all, return EOF */
        if (!dev->bulk_in_urb || !count)
@@ -401,7 +401,7 @@ static ssize_t skel_write(struct file *file, const char *user_buffer,
        char *buf = NULL;
        size_t writesize = min(count, (size_t)MAX_TRANSFER);
 
-       dev = (struct usb_skel *)file->private_data;
+       dev = file->private_data;
 
        /* verify that we actually have some data to write */
        if (count == 0)