diff options
| author | Christoph Hellwig | 2006-01-14 22:21:25 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-15 03:27:14 +0100 |
| commit | 67a6680d64e18c7a1901f31ef747ea53b6cd986d (patch) | |
| tree | 1d428eb19fdd393290348c63911c2974016ebc9d /include/linux/fb.h | |
| parent | [PATCH] gx1fb: (try to) play nicer with various BIOSes (diff) | |
| download | kernel-qcow2-linux-67a6680d64e18c7a1901f31ef747ea53b6cd986d.tar.gz kernel-qcow2-linux-67a6680d64e18c7a1901f31ef747ea53b6cd986d.tar.xz kernel-qcow2-linux-67a6680d64e18c7a1901f31ef747ea53b6cd986d.zip | |
[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 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index a973be2cfe61..6da8a80a2662 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -608,12 +608,12 @@ struct fb_ops { int (*fb_sync)(struct fb_info *info); /* perform fb specific ioctl (optional) */ - int (*fb_ioctl)(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg, struct fb_info *info); + int (*fb_ioctl)(struct fb_info *info, unsigned int cmd, + unsigned long arg); /* Handle 32bit compat ioctl (optional) */ - long (*fb_compat_ioctl)(struct file *f, unsigned cmd, unsigned long arg, - struct fb_info *info); + int (*fb_compat_ioctl)(struct fb_info *info, unsigned cmd, + unsigned long arg); /* perform fb specific mmap */ int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma); |