Merge branches 'x86-rwsem-for-linus' and 'x86-gcc46-for-linus' of git://git.kernel...

[sfrench/cifs-2.6.git] / drivers / scsi / pmcraid.c

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 9ebcea3643b2b703c5a16f66d46c22af982a3fa5..ecc45c8b4e6bd47d851c79f82c69af9447861b25 100644 (file)
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3599,8 +3599,7 @@ static int pmcraid_chr_open(struct inode *inode, struct file *filep)
  */
 static int pmcraid_chr_release(struct inode *inode, struct file *filep)
 {
-       struct pmcraid_instance *pinstance =
-               ((struct pmcraid_instance *)filep->private_data);
+       struct pmcraid_instance *pinstance = filep->private_data;
 
        filep->private_data = NULL;
        fasync_helper(-1, filep, 0, &pinstance->aen_queue);
@@ -3619,7 +3618,7 @@ static int pmcraid_chr_fasync(int fd, struct file *filep, int mode)
        struct pmcraid_instance *pinstance;
        int rc;
 
-       pinstance = (struct pmcraid_instance *)filep->private_data;
+       pinstance = filep->private_data;
        mutex_lock(&pinstance->aen_queue_lock);
        rc = fasync_helper(fd, filep, mode, &pinstance->aen_queue);
        mutex_unlock(&pinstance->aen_queue_lock);
@@ -4110,7 +4109,7 @@ static long pmcraid_chr_ioctl(
                return retval;
        }
 
-       pinstance = (struct pmcraid_instance *)filep->private_data;
+       pinstance = filep->private_data;
 
        if (!pinstance) {
                pmcraid_info("adapter instance is not found\n");