Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51fc8e8a authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7b3d1c82

drivers/video/sa1100fb.c

+3 −13
Original line number Original line Diff line number Diff line
@@ -556,7 +556,7 @@ static int sa1100fb_mmap(struct fb_info *info, 
			 struct vm_area_struct *vma)

			 struct vm_area_struct *vma)

{

{

	struct sa1100fb_info *fbi = (struct sa1100fb_info *)info;

	struct sa1100fb_info *fbi = (struct sa1100fb_info *)info;

	unsigned long start, len, off = vma->vm_pgoff << PAGE_SHIFT;

	unsigned long off = vma->vm_pgoff << PAGE_SHIFT;





	if (off < info->fix.smem_len) {

	if (off < info->fix.smem_len) {

		vma->vm_pgoff += 1; /* skip over the palette */

		vma->vm_pgoff += 1; /* skip over the palette */
@@ -564,19 +564,9 @@ static int sa1100fb_mmap(struct fb_info *info, 
					     fbi->map_dma, fbi->map_size);

					     fbi->map_dma, fbi->map_size);

	}

	}





	start = info->fix.mmio_start;

	len = PAGE_ALIGN((start & ~PAGE_MASK) + info->fix.mmio_len);



	if ((vma->vm_end - vma->vm_start + off) > len)

		return -EINVAL;



	off += start & PAGE_MASK;

	vma->vm_pgoff = off >> PAGE_SHIFT;

	vma->vm_flags |= VM_IO;

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,



				   vma->vm_end - vma->vm_start,

	return vm_iomap_memory(vma, info->fix.mmio_start, info->fix.mmio_len);

				   vma->vm_page_prot);

}

}





static struct fb_ops sa1100fb_ops = {

static struct fb_ops sa1100fb_ops = {