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:15 -0500 |
commit | 216d526c89d144928f095f2800bc6c67e968d628 (patch) | |
tree | 2363b4c9ab1e4f7acea503427fa6a21e5fa3dbe8 /drivers/video/sgivwfb.c | |
parent | 67a6680d64e18c7a1901f31ef747ea53b6cd986d (diff) |
[PATCH] fbdev: Sanitize ->fb_mmap prototype
No need for a file argument. If we'd really need it it's in vma->vm_file
already. gbefb and sgivwfb used to set vma->vm_file to the file argument, but
the kernel alrady did that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
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/sgivwfb.c')
-rw-r--r-- | drivers/video/sgivwfb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c index 7054660767e4..2e6df1fcb2b9 100644 --- a/drivers/video/sgivwfb.c +++ b/drivers/video/sgivwfb.c | |||
@@ -115,7 +115,7 @@ static int sgivwfb_set_par(struct fb_info *info); | |||
115 | static int sgivwfb_setcolreg(u_int regno, u_int red, u_int green, | 115 | static int sgivwfb_setcolreg(u_int regno, u_int red, u_int green, |
116 | u_int blue, u_int transp, | 116 | u_int blue, u_int transp, |
117 | struct fb_info *info); | 117 | struct fb_info *info); |
118 | static int sgivwfb_mmap(struct fb_info *info, struct file *file, | 118 | static int sgivwfb_mmap(struct fb_info *info, |
119 | struct vm_area_struct *vma); | 119 | struct vm_area_struct *vma); |
120 | 120 | ||
121 | static struct fb_ops sgivwfb_ops = { | 121 | static struct fb_ops sgivwfb_ops = { |
@@ -706,7 +706,7 @@ static int sgivwfb_setcolreg(u_int regno, u_int red, u_int green, | |||
706 | return 0; | 706 | return 0; |
707 | } | 707 | } |
708 | 708 | ||
709 | static int sgivwfb_mmap(struct fb_info *info, struct file *file, | 709 | static int sgivwfb_mmap(struct fb_info *info, |
710 | struct vm_area_struct *vma) | 710 | struct vm_area_struct *vma) |
711 | { | 711 | { |
712 | unsigned long size = vma->vm_end - vma->vm_start; | 712 | unsigned long size = vma->vm_end - vma->vm_start; |
@@ -723,7 +723,6 @@ static int sgivwfb_mmap(struct fb_info *info, struct file *file, | |||
723 | if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT, | 723 | if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT, |
724 | size, vma->vm_page_prot)) | 724 | size, vma->vm_page_prot)) |
725 | return -EAGAIN; | 725 | return -EAGAIN; |
726 | vma->vm_file = file; | ||
727 | printk(KERN_DEBUG "sgivwfb: mmap framebuffer P(%lx)->V(%lx)\n", | 726 | printk(KERN_DEBUG "sgivwfb: mmap framebuffer P(%lx)->V(%lx)\n", |
728 | offset, vma->vm_start); | 727 | offset, vma->vm_start); |
729 | return 0; | 728 | return 0; |