diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-18 04:52:42 (GMT) |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 05:28:47 (GMT) |
| commit | 11bd5933abe033fb7a3a0d1f1bd2cb4b6df8143f (patch) | |
| tree | 710ead685dcbe4094ca6443b23f5b810cdf5bf4e | |
| parent | c84deb9d615c02993ce0972a0b34585c7624822f (diff) | |
| download | linux-11bd5933abe033fb7a3a0d1f1bd2cb4b6df8143f.tar.xz | |
fbdev/ps3fb: 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: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
| -rw-r--r-- | drivers/video/ps3fb.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 920c27b..d9f08c6 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c @@ -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; } /* |