From 9a8c7fffa2293417d0245fb9f618564d7dee04a6 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 8 Mar 2014 10:09:29 -0300 Subject: [PATCH] [media] omap3isp: queue: Use sg_alloc_table_from_pages() Replace the custom implementation with a call to the scatterlist helper function. Signed-off-by: Laurent Pinchart Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/omap3isp/ispqueue.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/omap3isp/ispqueue.c b/drivers/media/platform/omap3isp/ispqueue.c index 4a271c7a2cf5..cee1b5d29cfa 100644 --- a/drivers/media/platform/omap3isp/ispqueue.c +++ b/drivers/media/platform/omap3isp/ispqueue.c @@ -233,12 +233,10 @@ static void isp_video_buffer_cleanup(struct isp_video_buffer *buf) */ static int isp_video_buffer_prepare_user(struct isp_video_buffer *buf) { - struct scatterlist *sg; unsigned int offset; unsigned long data; unsigned int first; unsigned int last; - unsigned int i; int ret; data = buf->vbuf.m.userptr; @@ -267,21 +265,11 @@ static int isp_video_buffer_prepare_user(struct isp_video_buffer *buf) if (ret < 0) return ret; - ret = sg_alloc_table(&buf->sgt, buf->npages, GFP_KERNEL); + ret = sg_alloc_table_from_pages(&buf->sgt, buf->pages, buf->npages, + offset, buf->vbuf.length, GFP_KERNEL); if (ret < 0) return ret; - for (sg = buf->sgt.sgl, i = 0; i < buf->npages; ++i) { - if (PageHighMem(buf->pages[i])) { - sg_free_table(&buf->sgt); - return -EINVAL; - } - - sg_set_page(sg, buf->pages[i], PAGE_SIZE - offset, offset); - sg = sg_next(sg); - offset = 0; - } - return 0; } -- 2.34.1