Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fbdev: pass struct fb_info to fb_read and fb_write

Browse Source 
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.

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Antonino A. Daplas 2007-05-08 00:39:02 -07:00 committed by Linus Torvalds
parent 87b4884935
commit 3f9b0880e4
6 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/arcfb.c
View File

@ -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 * the fb. it's inefficient for them to do anything less than 64*8
* writes since we update the lcd in each write() anyway. * 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, static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
loff_t *ppos) size_t count, loff_t *ppos)
{ {
/* modded from epson 1355 */ /* modded from epson 1355 */
struct inode *inode;
int fbidx;
struct fb_info *info;
unsigned long p; unsigned long p;
int err=-EINVAL; int err=-EINVAL;
unsigned int fbmemlength,x,y,w,h, bitppos, startpos, endpos, bitcount; 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; unsigned int xres;
p = *ppos; 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; par = info->par;
xres = info->var.xres; xres = info->var.xres;
fbmemlength = (xres * info->var.yres)/8; fbmemlength = (xres * info->var.yres)/8;

18
drivers/video/epson1355fb.c
View File

@ -403,17 +403,10 @@ static inline unsigned long copy_to_user16(void *to, const void *from,
static ssize_t 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; 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) if (p >= info->fix.smem_len)
return 0; return 0;
if (count >= info->fix.smem_len) if (count >= info->fix.smem_len)
@ -434,19 +427,12 @@ epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)
} }
static ssize_t 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) 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; unsigned long p = *ppos;
int err; 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 */ /* from fbmem.c except for our own copy_*_user */
if (p > info->fix.smem_len) if (p > info->fix.smem_len)
return -ENOSPC; return -ENOSPC;

4
drivers/video/fbmem.c
View File

@ -588,7 +588,7 @@ fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
return -EPERM; return -EPERM;
if (info->fbops->fb_read) 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; 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; return -EPERM;
if (info->fbops->fb_write) 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; total_size = info->screen_size;

12
drivers/video/hecubafb.c
View File

@ -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 * 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 * 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) size_t count, loff_t *ppos)
{ {
struct inode *inode;
int fbidx;
struct fb_info *info;
unsigned long p; unsigned long p;
int err=-EINVAL; int err=-EINVAL;
struct hecubafb_par *par; struct hecubafb_par *par;
@ -280,13 +277,6 @@ static ssize_t hecubafb_write(struct file *file, const char __user *buf,
unsigned int fbmemlength; unsigned int fbmemlength;
p = *ppos; 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; par = info->par;
xres = info->var.xres; xres = info->var.xres;
fbmemlength = (xres * info->var.yres)/8; fbmemlength = (xres * info->var.yres)/8;

4
drivers/video/pvr2fb.c
View File

@ -214,7 +214,7 @@ static int pvr2_init_cable(void);
static int pvr2_get_param(const struct pvr2_params *p, const char *s, static int pvr2_get_param(const struct pvr2_params *p, const char *s,
int val, int size); int val, int size);
#ifdef CONFIG_SH_DMA #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); size_t count, loff_t *ppos);
#endif #endif
@ -674,7 +674,7 @@ static int pvr2_init_cable(void)
} }
#ifdef CONFIG_SH_DMA #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) size_t count, loff_t *ppos)
{ {
unsigned long dst, start, end, len; unsigned long dst, start, end, len;

6
include/linux/fb.h
View File

@ -591,8 +591,10 @@ struct fb_ops {
/* For framebuffers with strange non linear layouts or that do not /* For framebuffers with strange non linear layouts or that do not
* work with normal memory mapped access * 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_read)(struct fb_info *info, char __user *buf,
ssize_t (*fb_write)(struct file *file, const char __user *buf, size_t count, loff_t *ppos); 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, /* checks var and eventually tweaks it to something supported,
* DO NOT MODIFY PAR */ * DO NOT MODIFY PAR */