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/p9100.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/p9100.c')
-rw-r--r-- | drivers/video/p9100.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index b251e754e16c..a1025e9606f1 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
@@ -32,8 +32,7 @@ static int p9100_setcolreg(unsigned, unsigned, unsigned, unsigned, | |||
32 | static int p9100_blank(int, struct fb_info *); | 32 | static int p9100_blank(int, struct fb_info *); |
33 | 33 | ||
34 | static int p9100_mmap(struct fb_info *, struct file *, struct vm_area_struct *); | 34 | static int p9100_mmap(struct fb_info *, struct file *, struct vm_area_struct *); |
35 | static int p9100_ioctl(struct inode *, struct file *, unsigned int, | 35 | static int p9100_ioctl(struct fb_info *, unsigned int, unsigned long); |
36 | unsigned long, struct fb_info *); | ||
37 | 36 | ||
38 | /* | 37 | /* |
39 | * Frame buffer operations | 38 | * Frame buffer operations |
@@ -232,8 +231,8 @@ static int p9100_mmap(struct fb_info *info, struct file *file, struct vm_area_st | |||
232 | vma); | 231 | vma); |
233 | } | 232 | } |
234 | 233 | ||
235 | static int p9100_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 234 | static int p9100_ioctl(struct fb_info *info, unsigned int cmd, |
236 | unsigned long arg, struct fb_info *info) | 235 | unsigned long arg) |
237 | { | 236 | { |
238 | struct p9100_par *par = (struct p9100_par *) info->par; | 237 | struct p9100_par *par = (struct p9100_par *) info->par; |
239 | 238 | ||