Skip to content

Commit

Permalink
fbdev/ps3fb: 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: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
  • Loading branch information
Tomi Valkeinen committed Apr 26, 2013
1 parent c84deb9 commit 11bd593
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions drivers/video/ps3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -705,21 +705,15 @@ static int ps3fb_pan_display(struct fb_var_screeninfo *var,

static int ps3fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
{
unsigned long size, offset;
int r;

size = vma->vm_end - vma->vm_start;
offset = vma->vm_pgoff << PAGE_SHIFT;
if (offset + size > info->fix.smem_len)
return -EINVAL;

offset += info->fix.smem_start;
if (remap_pfn_range(vma, vma->vm_start, offset >> PAGE_SHIFT,
size, vma->vm_page_prot))
return -EAGAIN;
r = vm_iomap_memory(vma, info->fix.smem_start, info->fix.smem_len);

dev_dbg(info->device, "ps3fb: mmap framebuffer P(%lx)->V(%lx)\n",
offset, vma->vm_start);
return 0;
info->fix.smem_start + vma->vm_pgoff << PAGE_SHIFT,
vma->vm_start);

return r;
}

/*
Expand Down

0 comments on commit 11bd593

Please sign in to comment.