SG: Change sg_set_page() to take length and offset argument

Most drivers need to set length and offset as well, so may as well fold
those three lines into one.

Add sg_assign_page() for those two locations that only needed to set
the page, where the offset/length is set outside of the function context.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

3 files changed, 6 insertions, 13 deletions

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 2b1f8b4be00..cb034ead95a 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -118,8 +118,7 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
                 if (NULL == pg)
                         goto err;
                 BUG_ON(PageHighMem(pg));
-                sg_set_page(&sglist[i], pg);
-                sglist[i].length = PAGE_SIZE;
+                sg_set_page(&sglist[i], pg, PAGE_SIZE, 0);
         }
         return sglist;
 
diff --git a/drivers/media/video/ivtv/ivtv-udma.c b/drivers/media/video/ivtv/ivtv-udma.c
index 912b424e520..460db03b0ba 100644
--- a/drivers/media/video/ivtv/ivtv-udma.c
+++ b/drivers/media/video/ivtv/ivtv-udma.c
@@ -49,8 +49,6 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_info
                 unsigned int len = (i == dma_page->page_count - 1) ?
                         dma_page->tail : PAGE_SIZE - offset;
 
-                dma->SGlist[map_offset].length = len;
-                dma->SGlist[map_offset].offset = offset;
                 if (PageHighMem(dma->map[map_offset])) {
                         void *src;
 
@@ -63,10 +61,10 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_info
                         memcpy(page_address(dma->bouncemap[map_offset]) + offset, src, len);
                         kunmap_atomic(src, KM_BOUNCE_READ);
                         local_irq_restore(flags);
-                        sg_set_page(&dma->SGlist[map_offset], dma->bouncemap[map_offset]);
+                        sg_set_page(&dma->SGlist[map_offset], dma->bouncemap[map_offset], len, offset);
                 }
                 else {
-                        sg_set_page(&dma->SGlist[map_offset], dma->map[map_offset]);
+                        sg_set_page(&dma->SGlist[map_offset], dma->map[map_offset], len, offset);
                 }
                 offset = 0;
                 map_offset++;
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 9ab94a749d8..44ee408e145 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -67,8 +67,7 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
                 if (NULL == pg)
                         goto err;
                 BUG_ON(PageHighMem(pg));
-                sg_set_page(&sglist[i], pg);
-                sglist[i].length = PAGE_SIZE;
+                sg_set_page(&sglist[i], pg, PAGE_SIZE, 0);
         }
         return sglist;
 
@@ -95,16 +94,13 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset)
         if (PageHighMem(pages[0]))
                 /* DMA to highmem pages might not work */
                 goto highmem;
-        sg_set_page(&sglist[0], pages[0]);
-        sglist[0].offset = offset;
-        sglist[0].length = PAGE_SIZE - offset;
+        sg_set_page(&sglist[0], pages[0], PAGE_SIZE - offset, offset);
         for (i = 1; i < nr_pages; i++) {
                 if (NULL == pages[i])
                         goto nopage;
                 if (PageHighMem(pages[i]))
                         goto highmem;
-                sg_set_page(&sglist[i], pages[i]);
-                sglist[i].length = PAGE_SIZE;
+                sg_set_page(&sglist[i], pages[i], PAGE_SIZE, 0);
         }
         return sglist;