Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev/sa1100fb: 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>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

+3 -13
+3 -13
drivers/video/sa1100fb.c
··· 556 556 struct vm_area_struct *vma) 557 557 { 558 558 struct sa1100fb_info *fbi = (struct sa1100fb_info *)info; 559 - unsigned long start, len, off = vma->vm_pgoff << PAGE_SHIFT; 559 + unsigned long off = vma->vm_pgoff << PAGE_SHIFT; 560 560 561 561 if (off < info->fix.smem_len) { 562 562 vma->vm_pgoff += 1; /* skip over the palette */ ··· 564 564 fbi->map_dma, fbi->map_size); 565 565 } 566 566 567 - start = info->fix.mmio_start; 568 - len = PAGE_ALIGN((start & ~PAGE_MASK) + info->fix.mmio_len); 569 - 570 - if ((vma->vm_end - vma->vm_start + off) > len) 571 - return -EINVAL; 572 - 573 - off += start & PAGE_MASK; 574 - vma->vm_pgoff = off >> PAGE_SHIFT; 575 - vma->vm_flags |= VM_IO; 576 567 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); 577 - return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, 578 - vma->vm_end - vma->vm_start, 579 - vma->vm_page_prot); 568 + 569 + return vm_iomap_memory(vma, info->fix.mmio_start, info->fix.mmio_len); 580 570 } 581 571 582 572 static struct fb_ops sa1100fb_ops = {