6 files changed, 13 insertions, 45 deletions

diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 740b83b4bd8c..c668e56c9272 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -440,14 +440,11 @@ static int arcfb_ioctl(struct fb_info *info,
  * the fb. it's inefficient for them to do anything less than 64*8
  * writes since we update the lcd in each write() anyway.
  */
-static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t count,
-                                loff_t *ppos)
+static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
+                           size_t count, loff_t *ppos)
 {
         /* modded from epson 1355 */
 
-        struct inode *inode;
-        int fbidx;
-        struct fb_info *info;
         unsigned long p;
         int err=-EINVAL;
         unsigned int fbmemlength,x,y,w,h, bitppos, startpos, endpos, bitcount;
@@ -455,13 +452,6 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou
         unsigned int xres;
 
         p = *ppos;
-        inode = file->f_path.dentry->d_inode;
-        fbidx = iminor(inode);
-        info = registered_fb[fbidx];
-
-        if (!info || !info->screen_base)
-                return -ENODEV;
-
         par = info->par;
         xres = info->var.xres;
         fbmemlength = (xres * info->var.yres)/8;
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 37e297d7feb7..ca2c54ce508e 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -403,17 +403,10 @@ static inline unsigned long copy_to_user16(void *to, const void *from,
 
 
 static ssize_t
-epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)
+epson1355fb_read(struct fb_info *info, char *buf, size_t count, loff_t * ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
-        int fbidx = iminor(inode);
-        struct fb_info *info = registered_fb[fbidx];
         unsigned long p = *ppos;
 
-        /* from fbmem.c except for our own copy_*_user */
-        if (!info || !info->screen_base)
-                return -ENODEV;
-
         if (p >= info->fix.smem_len)
                 return 0;
         if (count >= info->fix.smem_len)
@@ -434,20 +427,13 @@ epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)
 }
 
 static ssize_t
-epson1355fb_write(struct file *file, const char *buf,
+epson1355fb_write(struct fb_info *info, const char *buf,
                   size_t count, loff_t * ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
-        int fbidx = iminor(inode);
-        struct fb_info *info = registered_fb[fbidx];
         unsigned long p = *ppos;
         int err;
 
         /* from fbmem.c except for our own copy_*_user */
-        if (!info || !info->screen_base)
-                return -ENODEV;
-
-        /* from fbmem.c except for our own copy_*_user */
         if (p > info->fix.smem_len)
                 return -ENOSPC;
         if (count >= info->fix.smem_len)
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 08c292d9c401..7b72841222df 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -588,7 +588,7 @@ fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                 return -EPERM;
 
         if (info->fbops->fb_read)
-                return info->fbops->fb_read(file, buf, count, ppos);
+                return info->fbops->fb_read(info, buf, count, ppos);
         
         total_size = info->screen_size;
 
@@ -663,7 +663,7 @@ fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                 return -EPERM;
 
         if (info->fbops->fb_write)
-                return info->fbops->fb_write(file, buf, count, ppos);
+                return info->fbops->fb_write(info, buf, count, ppos);
         
         total_size = info->screen_size;
 
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
index 0ade72590998..3ec0e97f36e4 100644
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@@ -267,12 +267,9 @@ static void hecubafb_imageblit(struct fb_info *info,
  * this is the slow path from userspace. they can seek and write to
  * the fb. it's inefficient to do anything less than a full screen draw
  */
-static ssize_t hecubafb_write(struct file *file, const char __user *buf,
+static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
                                 size_t count, loff_t *ppos)
 {
-        struct inode *inode;
-        int fbidx;
-        struct fb_info *info;
         unsigned long p;
         int err=-EINVAL;
         struct hecubafb_par *par;
@@ -280,13 +277,6 @@ static ssize_t hecubafb_write(struct file *file, const char __user *buf,
         unsigned int fbmemlength;
 
         p = *ppos;
-        inode = file->f_dentry->d_inode;
-        fbidx = iminor(inode);
-        info = registered_fb[fbidx];
-
-        if (!info || !info->screen_base)
-                return -ENODEV;
-
         par = info->par;
         xres = info->var.xres;
         fbmemlength = (xres * info->var.yres)/8;
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index a93618bc9d27..df2909ae704c 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -214,7 +214,7 @@ static int pvr2_init_cable(void);
 static int pvr2_get_param(const struct pvr2_params *p, const char *s,
                             int val, int size);
 #ifdef CONFIG_SH_DMA
-static ssize_t pvr2fb_write(struct file *file, const char *buf,
+static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
                             size_t count, loff_t *ppos);
 #endif
 
@@ -674,7 +674,7 @@ static int pvr2_init_cable(void)
 }
 
 #ifdef CONFIG_SH_DMA
-static ssize_t pvr2fb_write(struct file *file, const char *buf,
+static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
                             size_t count, loff_t *ppos)
 {
         unsigned long dst, start, end, len;
diff --git a/include/linux/fb.h b/include/linux/fb.h
index c4e1b3d2ecf9..acb6ddb68fa2 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -591,8 +591,10 @@ struct fb_ops {
         /* For framebuffers with strange non linear layouts or that do not
          * work with normal memory mapped access
          */
-        ssize_t (*fb_read)(struct file *file, char __user *buf, size_t count, loff_t *ppos);
-        ssize_t (*fb_write)(struct file *file, const char __user *buf, size_t count, loff_t *ppos);
+        ssize_t (*fb_read)(struct fb_info *info, char __user *buf,
+                           size_t count, loff_t *ppos);
+        ssize_t (*fb_write)(struct fb_info *info, const char __user *buf,
+                            size_t count, loff_t *ppos);
 
         /* checks var and eventually tweaks it to something supported,
          * DO NOT MODIFY PAR */