Skip to content

Commit

Permalink
fbdev/vermillion: use vm_iomap_memory()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomi Valkeinen committed Apr 24, 2013
1 parent 51fc8e8 commit 5171774
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/video/vermilion/vermilion.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5171774

Please sign in to comment.