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

Commit 216d526c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] fbdev: Sanitize ->fb_mmap prototype 



No need for a file argument.  If we'd really need it it's in vma->vm_file
already.  gbefb and sgivwfb used to set vma->vm_file to the file argument, but
the kernel alrady did that.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 67a6680d

drivers/video/68328fb.c

+2 −4
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ static int mc68x328fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, 
			 u_int transp, struct fb_info *info);

static int mc68x328fb_pan_display(struct fb_var_screeninfo *var,

			   struct fb_info *info);

static int mc68x328fb_mmap(struct fb_info *info, struct file *file,

		    struct vm_area_struct *vma);

static int mc68x328fb_mmap(struct fb_info *info, struct vm_area_struct *vma);



static struct fb_ops mc68x328fb_ops = {

	.fb_check_var	= mc68x328fb_check_var,
@@ -398,8 +397,7 @@ static int mc68x328fb_pan_display(struct fb_var_screeninfo *var, 
     *  Most drivers don't need their own mmap function 

     */



static int mc68x328fb_mmap(struct fb_info *info, struct file *file,

		    struct vm_area_struct *vma)

static int mc68x328fb_mmap(struct fb_info *info, struct vm_area_struct *vma)

{

#ifndef MMU

	/* this is uClinux (no MMU) specific code */

drivers/video/acornfb.c

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ acornfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) 
 * Note that we are entered with the kernel locked.

 */

static int

acornfb_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma)

acornfb_mmap(struct fb_info *info, struct vm_area_struct *vma)

{

	unsigned long off, start;

	u32 len;

drivers/video/amba-clcd.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int clcdfb_blank(int blank_mode, struct fb_info *info) 
	return 0;

}



static int clcdfb_mmap(struct fb_info *info, struct file *file,

static int clcdfb_mmap(struct fb_info *info,

		       struct vm_area_struct *vma)

{

	struct clcd_fb *fb = to_clcd(info);

drivers/video/aty/atyfb_base.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ extern void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) 
extern void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);

extern void atyfb_imageblit(struct fb_info *info, const struct fb_image *image);

#ifdef __sparc__

static int atyfb_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma);

static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma);

#endif

static int atyfb_sync(struct fb_info *info);
@@ -1843,7 +1843,7 @@ static int atyfb_sync(struct fb_info *info) 
}



#ifdef __sparc__

static int atyfb_mmap(struct fb_info *info, struct file *file, struct vm_area_struct *vma)

static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma)

{

	struct atyfb_par *par = (struct atyfb_par *) info->par;

	unsigned int size, page, map_size = 0;

drivers/video/au1100fb.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ void au1100fb_fb_rotate(struct fb_info *fbi, int angle) 
 * Map video memory in user space. We don't use the generic fb_mmap method mainly

 * to allow the use of the TLB streaming flag (CCA=6)

 */

int au1100fb_fb_mmap(struct fb_info *fbi, struct file *file, struct vm_area_struct *vma)

int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)

{

	struct au1100fb_device *fbdev = to_au1100fb_device(fbi);

	unsigned int len;