diff options
| author | Ricardo Ribalda <ricardo.ribalda@gmail.com> | 2013-08-02 10:20:00 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:51:50 +0900 |
| commit | 9fa8b2dbe2b31ec31124f45a0c8a9591c3d2e2ed (patch) | |
| tree | a2b64ace29211bf31e96e11a2b632b5e06da9ac9 /include/media | |
| parent | 550416e178df1dcc7b3cc07146bf6706be164412 (diff) | |
| download | linux-3.10-9fa8b2dbe2b31ec31124f45a0c8a9591c3d2e2ed.tar.gz linux-3.10-9fa8b2dbe2b31ec31124f45a0c8a9591c3d2e2ed.tar.bz2 linux-3.10-9fa8b2dbe2b31ec31124f45a0c8a9591c3d2e2ed.zip | |
upstream: [media] videobuf2-dma-sg: Replace vb2_dma_sg_desc with sg_table
Replace the private struct vb2_dma_sg_desc with the struct sg_table so
we can benefit from all the helping functions in lib/scatterlist.c for
things like allocating the sg or compacting the descriptor.
marvel-ccic and solo6x10 drivers, that use this API have been updated.
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
[s.nawrocki@samsung.com: minor corrections of the changelog]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/videobuf2-dma-sg.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/media/videobuf2-dma-sg.h b/include/media/videobuf2-dma-sg.h index 0038526b8ef..7b89852779a 100644 --- a/include/media/videobuf2-dma-sg.h +++ b/include/media/videobuf2-dma-sg.h @@ -15,16 +15,10 @@ #include <media/videobuf2-core.h> -struct vb2_dma_sg_desc { - unsigned long size; - unsigned int num_pages; - struct scatterlist *sglist; -}; - -static inline struct vb2_dma_sg_desc *vb2_dma_sg_plane_desc( +static inline struct sg_table *vb2_dma_sg_plane_desc( struct vb2_buffer *vb, unsigned int plane_no) { - return (struct vb2_dma_sg_desc *)vb2_plane_cookie(vb, plane_no); + return (struct sg_table *)vb2_plane_cookie(vb, plane_no); } extern const struct vb2_mem_ops vb2_dma_sg_memops; |