From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Subject: [PATCH 10/11] fbdev/ps3fb: use vm_iomap_memory()
Date: Tue, 23 Apr 2013 06:36:57 +0000 [thread overview]
Message-ID: <1366699018-5439-10-git-send-email-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <1366699018-5439-1-git-send-email-tomi.valkeinen@ti.com>
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>
---
drivers/video/ps3fb.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 920c27b..1bdeb08 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -705,21 +705,14 @@ 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_ioremap_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;
+
+ return r;
}
/*
--
1.7.10.4
next prev parent reply other threads:[~2013-04-23 6:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-23 6:36 [PATCH 01/11] fbdev/fbmem: use vm_iomap_memory() Tomi Valkeinen
2013-04-23 6:36 ` [PATCH 02/11] fbdev/omapfb: " Tomi Valkeinen
2013-04-23 6:36 ` [PATCH 03/11] fbdev/au1100fb: " Tomi Valkeinen
2013-04-23 6:36 ` [PATCH 04/11] fbdev/au1200fb: " Tomi Valkeinen
2013-04-23 6:36 ` [PATCH 05/11] fbdev/controlfb: " Tomi Valkeinen
2013-04-23 6:36 ` [PATCH 06/11] fbdev/fb-puv3: " Tomi Valkeinen
2013-04-23 6:36 ` [PATCH 07/11] fbdev/sa1100fb: " Tomi Valkeinen
2013-04-23 18:53 ` Russell King - ARM Linux
2013-04-23 6:36 ` [PATCH 08/11] fbdev/vermillion: " Tomi Valkeinen
2013-04-23 6:36 ` [PATCH 09/11] fbdev/sgivwfb: " Tomi Valkeinen
2013-04-23 6:36 ` Tomi Valkeinen [this message]
2013-04-23 6:36 ` [PATCH 11/11] fbdev: improve fb_mmap bounds checks Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366699018-5439-10-git-send-email-tomi.valkeinen@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=Geert.Uytterhoeven@sonycom.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).