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

[linux-flexiantxendom0.git] / drivers / infiniband / hw / qib / qib_file_ops.c

diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index aa2be21..79d9971 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1723,7 +1723,7 @@ static int qib_close(struct inode *in, struct file *fp)
 
        mutex_lock(&qib_mutex);
 
-       fd = (struct qib_filedata *) fp->private_data;
+       fd = fp->private_data;
        fp->private_data = NULL;
        rcd = fd->rcd;
        if (!rcd) {
@@ -1809,7 +1809,7 @@ static int qib_ctxt_info(struct file *fp, struct qib_ctxt_info __user *uinfo)
        struct qib_ctxtdata *rcd = ctxt_fp(fp);
        struct qib_filedata *fd;
 
-       fd = (struct qib_filedata *) fp->private_data;
+       fd = fp->private_data;
 
        info.num_active = qib_count_active_units();
        info.unit = rcd->dd->unit;