diff options
author | Christoph Hellwig <hch@lst.de> | 2006-01-14 16:21:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 21:27:14 -0500 |
commit | 67a6680d64e18c7a1901f31ef747ea53b6cd986d (patch) | |
tree | 1d428eb19fdd393290348c63911c2974016ebc9d /drivers/video/cg6.c | |
parent | a80da7389891d0eeacbd568a9b54f665fd424d14 (diff) |
[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/cg6.c')
-rw-r--r-- | drivers/video/cg6.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 050835e39aa3..678e335d2b0f 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
@@ -37,8 +37,7 @@ static void cg6_imageblit(struct fb_info *, const struct fb_image *); | |||
37 | static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *); | 37 | static void cg6_fillrect(struct fb_info *, const struct fb_fillrect *); |
38 | static int cg6_sync(struct fb_info *); | 38 | static int cg6_sync(struct fb_info *); |
39 | static int cg6_mmap(struct fb_info *, struct file *, struct vm_area_struct *); | 39 | static int cg6_mmap(struct fb_info *, struct file *, struct vm_area_struct *); |
40 | static int cg6_ioctl(struct inode *, struct file *, unsigned int, | 40 | static int cg6_ioctl(struct fb_info *, unsigned int, unsigned long); |
41 | unsigned long, struct fb_info *); | ||
42 | 41 | ||
43 | /* | 42 | /* |
44 | * Frame buffer operations | 43 | * Frame buffer operations |
@@ -534,8 +533,7 @@ static int cg6_mmap(struct fb_info *info, struct file *file, struct vm_area_stru | |||
534 | vma); | 533 | vma); |
535 | } | 534 | } |
536 | 535 | ||
537 | static int cg6_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 536 | static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) |
538 | unsigned long arg, struct fb_info *info) | ||
539 | { | 537 | { |
540 | struct cg6_par *par = (struct cg6_par *) info->par; | 538 | struct cg6_par *par = (struct cg6_par *) info->par; |
541 | 539 | ||