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/pm3fb.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/pm3fb.c')
-rw-r--r-- | drivers/video/pm3fb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c index 2e11b601c488..0e78ddc81583 100644 --- a/drivers/video/pm3fb.c +++ b/drivers/video/pm3fb.c | |||
@@ -657,9 +657,7 @@ static void pm3fb_set_disp(const void *par, struct display *disp, | |||
657 | static void pm3fb_detect(void); | 657 | static void pm3fb_detect(void); |
658 | static int pm3fb_pan_display(const struct fb_var_screeninfo *var, | 658 | static int pm3fb_pan_display(const struct fb_var_screeninfo *var, |
659 | struct fb_info_gen *info); | 659 | struct fb_info_gen *info); |
660 | static int pm3fb_ioctl(struct inode *inode, struct file *file, | 660 | static int pm3fb_ioctl(struct fb_info *info, u_int cmd, u_long arg); |
661 | u_int cmd, u_long arg, int con, | ||
662 | struct fb_info *info); | ||
663 | 661 | ||
664 | 662 | ||
665 | /* the struct that hold them together */ | 663 | /* the struct that hold them together */ |
@@ -3438,9 +3436,7 @@ static int pm3fb_pan_display(const struct fb_var_screeninfo *var, | |||
3438 | return 0; | 3436 | return 0; |
3439 | } | 3437 | } |
3440 | 3438 | ||
3441 | static int pm3fb_ioctl(struct inode *inode, struct file *file, | 3439 | static int pm3fb_ioctl(struct fb_info *info, u_int cmd, u_long arg) |
3442 | u_int cmd, u_long arg, int con, | ||
3443 | struct fb_info *info) | ||
3444 | { | 3440 | { |
3445 | struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info; | 3441 | struct pm3fb_info *l_fb_info = (struct pm3fb_info *) info; |
3446 | u32 cm, i; | 3442 | u32 cm, i; |