Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f9b0880 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

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.

Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87b48849

drivers/video/arcfb.c

+2 −12
Original line number Diff line number Diff line
@@ -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;

drivers/video/epson1355fb.c

+2 −16
Original line number Diff line number Diff line
@@ -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,19 +427,12 @@ 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;

drivers/video/fbmem.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/video/hecubafb.c

+1 −11
Original line number Diff line number Diff line
@@ -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;

drivers/video/pvr2fb.c

+2 −2
Original line number Diff line number Diff line
@@ -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;