fbdev: Pass struct fb_info to fb_read and fb_write
PATCH 21/41 fbdev: Pass struct fb_info to fb_read and fb_write
It is unnecessary to pass struct file to fb_read() and fb_write() in struct fb_ops. For consistency with the other methods, pass struct fb_info instead.
---
drivers/video/arcfb.c | 14 ++------------ drivers/video/epson1355fb.c | 18 ++---------------- drivers/video/fbmem.c | 4 ++-- drivers/video/hecubafb.c | 12 +----------- drivers/video/pvr2fb.c | 4 ++-- include/linux/fb.h | 6 ++++-- 6 files changed, 13 insertions(+), 45 deletions(-)
drivers/video/arcfb.c +2 -12
@@ -440,14 +440,11 @@ static int arcfb_ioctl(struct fb_info *i* 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 *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 ;
drivers/video/epson1355fb.c +2 -16
@@ -403,17 +403,10 @@ static inline unsigned long copy_to_userstatic 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 }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)
drivers/video/fbmem.c +2 -2
@@ -588,7 +588,7 @@ fb_read(struct file *file, char __user *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 _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;
drivers/video/hecubafb.c +1 -11
@@ -267,12 +267,9 @@ static void hecubafb_imageblit(struct fb* 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 filunsigned 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 ;
drivers/video/pvr2fb.c +2 -2
@@ -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;
include/linux/fb.h +4 -2
@@ -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 */
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
Quoted 4 lines · Antonino A. Daplas
It is unnecessary to pass struct file to
fb_read()andfb_write()in structfb_ops. For consistency with the other methods, pass structfb_infoinstead.Signed-off-by Antonino Daplas <[email protected]>
pvr2fb bits look fine.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/