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

Commit 67a6680d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] fbdev: Sanitize ->fb_ioctl prototype 



The ioctl and file arguments to ->fb_mmap are totally unused and there's not
reason a driver should need them.

Also update the ->fb_compat_ioctl prototype to be the same as ->fb_mmap.

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 a80da738

drivers/video/amifb.c

+3 −6
Original line number Diff line number Diff line
@@ -1131,9 +1131,7 @@ static void amifb_copyarea(struct fb_info *info, 
			   const struct fb_copyarea *region);

static void amifb_imageblit(struct fb_info *info,

			    const struct fb_image *image);

static int amifb_ioctl(struct inode *inode, struct file *file,

		       unsigned int cmd, unsigned long arg,

		       struct fb_info *info);

static int amifb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg);





	/*
@@ -2172,9 +2170,8 @@ static void amifb_imageblit(struct fb_info *info, const struct fb_image *image) 
	 * Amiga Frame Buffer Specific ioctls

	 */



static int amifb_ioctl(struct inode *inode, struct file *file,

		       unsigned int cmd, unsigned long arg,

		       struct fb_info *info)

static int amifb_ioctl(struct fb_info *info,

		       unsigned int cmd, unsigned long arg)

{

	union {

		struct fb_fix_cursorinfo fix;

drivers/video/arcfb.c

+2 −3
Original line number Diff line number Diff line
@@ -399,9 +399,8 @@ static void arcfb_imageblit(struct fb_info *info, const struct fb_image *image) 
				image->height);

}



static int arcfb_ioctl(struct inode *inode, struct file *file,

			  unsigned int cmd, unsigned long arg,

			  struct fb_info *info)

static int arcfb_ioctl(struct fb_info *info,

			  unsigned int cmd, unsigned long arg)

{

	void __user *argp = (void __user *)arg;

	struct arcfb_par *par = info->par;

drivers/video/atafb.c

+1 −2
Original line number Diff line number Diff line
@@ -2571,8 +2571,7 @@ atafb_pan_display(struct fb_var_screeninfo *var, int con, struct fb_info *info) 
}



static int

atafb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,

	       unsigned long arg, int con, struct fb_info *info)

atafb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)

{

	switch (cmd) {

#ifdef FBCMD_GET_CURRENTPAR

drivers/video/aty/aty128fb.c

+2 −4
Original line number Diff line number Diff line
@@ -431,8 +431,7 @@ static int aty128fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, 
static int aty128fb_pan_display(struct fb_var_screeninfo *var,

			   struct fb_info *fb);

static int aty128fb_blank(int blank, struct fb_info *fb);

static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,

			  u_long arg, struct fb_info *info);

static int aty128fb_ioctl(struct fb_info *info, u_int cmd, unsigned long arg);

static int aty128fb_sync(struct fb_info *info);



    /*
@@ -2108,8 +2107,7 @@ static int aty128fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, 
/* in param: u32*	backlight value: 0 to 15 */

#define FBIO_ATY128_SET_MIRROR	_IOW('@', 2, __u32)



static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,

			  u_long arg, struct fb_info *info)

static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)

{

	struct aty128fb_par *par = info->par;

	u32 value;

drivers/video/aty/atyfb_base.c

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

static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info);

static int atyfb_blank(int blank, struct fb_info *info);

static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd,

	u_long arg, struct fb_info *info);

static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg);

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);
@@ -1739,8 +1738,7 @@ struct atyclk { 
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)

#endif



static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd,

	u_long arg, struct fb_info *info)

static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)

{

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

#ifdef __sparc__