summaryrefslogtreecommitdiffstats
path: root/drivers/video/ffb.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-01-14 13:21:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 18:27:14 -0800
commit67a6680d64e18c7a1901f31ef747ea53b6cd986d (patch)
tree1d428eb19fdd393290348c63911c2974016ebc9d /drivers/video/ffb.c
parenta80da7389891d0eeacbd568a9b54f665fd424d14 (diff)
downloadop-kernel-dev-67a6680d64e18c7a1901f31ef747ea53b6cd986d.zip
op-kernel-dev-67a6680d64e18c7a1901f31ef747ea53b6cd986d.tar.gz
[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: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/ffb.c')
-rw-r--r--drivers/video/ffb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index c4870d5..d096c12 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -38,8 +38,7 @@ static void ffb_fillrect(struct fb_info *, const struct fb_fillrect *);
static void ffb_copyarea(struct fb_info *, const struct fb_copyarea *);
static int ffb_sync(struct fb_info *);
static int ffb_mmap(struct fb_info *, struct file *, struct vm_area_struct *);
-static int ffb_ioctl(struct inode *, struct file *, unsigned int,
- unsigned long, struct fb_info *);
+static int ffb_ioctl(struct fb_info *, unsigned int, unsigned long);
static int ffb_pan_display(struct fb_var_screeninfo *, struct fb_info *);
/*
@@ -848,8 +847,7 @@ static int ffb_mmap(struct fb_info *info, struct file *file, struct vm_area_stru
0, vma);
}
-static int ffb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg, struct fb_info *info)
+static int ffb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
{
struct ffb_par *par = (struct ffb_par *) info->par;
OpenPOWER on IntegriCloud