Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / drivers / s390 / char / vmcp.c

diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 0e7cb1a841519cdeacedcb40a2eae43d36e71b62..31a3ccbb6495c2e8efcdd34bbd8b3cacfbbf9154 100644 (file)
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -47,7 +47,7 @@ static int vmcp_release(struct inode *inode, struct file *file)
 {
        struct vmcp_session *session;
 
-       session = (struct vmcp_session *)file->private_data;
+       session = file->private_data;
        file->private_data = NULL;
        free_pages((unsigned long)session->response, get_order(session->bufsize));
        kfree(session);
@@ -94,7 +94,7 @@ vmcp_write(struct file *file, const char __user *buff, size_t count,
                return -EFAULT;
        }
        cmd[count] = '\0';
-       session = (struct vmcp_session *)file->private_data;
+       session = file->private_data;
        if (mutex_lock_interruptible(&session->mutex)) {
                kfree(cmd);
                return -ERESTARTSYS;
@@ -136,7 +136,7 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        int __user *argp;
        int temp;
 
-       session = (struct vmcp_session *)file->private_data;
+       session = file->private_data;
        if (is_compat_task())
                argp = compat_ptr(arg);
        else