diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-01-14 13:21:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 18:27:14 -0800 |
| commit | 67a6680d64e18c7a1901f31ef747ea53b6cd986d (patch) | |
| tree | 1d428eb19fdd393290348c63911c2974016ebc9d /drivers/video/cg14.c | |
| parent | a80da7389891d0eeacbd568a9b54f665fd424d14 (diff) | |
| download | op-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/cg14.c')
| -rw-r--r-- | drivers/video/cg14.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index a561471..edb9936 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c @@ -32,8 +32,7 @@ static int cg14_setcolreg(unsigned, unsigned, unsigned, unsigned, unsigned, struct fb_info *); static int cg14_mmap(struct fb_info *, struct file *, struct vm_area_struct *); -static int cg14_ioctl(struct inode *, struct file *, unsigned int, - unsigned long, struct fb_info *); +static int cg14_ioctl(struct fb_info *, unsigned int, unsigned long); static int cg14_pan_display(struct fb_var_screeninfo *, struct fb_info *); /* @@ -277,8 +276,7 @@ static int cg14_mmap(struct fb_info *info, struct file *file, struct vm_area_str par->iospace, vma); } -static int cg14_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg, struct fb_info *info) +static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { struct cg14_par *par = (struct cg14_par *) info->par; struct cg14_regs __iomem *regs = par->regs; |
