diff options
| author | Tomi Valkeinen | 2013-04-18 06:47:47 +0200 |
|---|---|---|
| committer | Tomi Valkeinen | 2013-04-24 07:41:42 +0200 |
| commit | 5171774382959f9a42ecd36bf408f6979effcb6a (patch) | |
| tree | 0500f1e85a76fcb6de050725861ebde5dd35a287 /drivers/video/vermilion | |
| parent | fbdev/sa1100fb: use vm_iomap_memory() (diff) | |
| download | kernel-qcow2-linux-5171774382959f9a42ecd36bf408f6979effcb6a.tar.gz kernel-qcow2-linux-5171774382959f9a42ecd36bf408f6979effcb6a.tar.xz kernel-qcow2-linux-5171774382959f9a42ecd36bf408f6979effcb6a.zip | |
fbdev/vermillion: use vm_iomap_memory()
Use vm_iomap_memory() instead of [io_]remap_pfn_range().
vm_iomap_memory() gives us much simpler API to map memory to userspace,
and reduces possibilities for bugs.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Alan Hourihane <alanh@fairlite.demon.co.uk>
Diffstat (limited to 'drivers/video/vermilion')
| -rw-r--r-- | drivers/video/vermilion/vermilion.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c index 0aa516fc59cd..09a136633f35 100644 --- a/drivers/video/vermilion/vermilion.c +++ b/drivers/video/vermilion/vermilion.c @@ -1003,24 +1003,18 @@ static int vmlfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, static int vmlfb_mmap(struct fb_info *info, struct vm_area_struct *vma) { struct vml_info *vinfo = container_of(info, struct vml_info, info); - unsigned long size = vma->vm_end - vma->vm_start; unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; int ret; - if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) - return -EINVAL; - if (offset + size > vinfo->vram_contig_size) - return -EINVAL; ret = vmlfb_vram_offset(vinfo, offset); if (ret) return -EINVAL; - offset += vinfo->vram_start; + pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT; - if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT, - size, vma->vm_page_prot)) - return -EAGAIN; - return 0; + + return vm_iomap_memory(vma, vinfo->vram_start, + vinfo->vram_contig_size); } static int vmlfb_sync(struct fb_info *info) |