diff options
| author |   Hans Verkuil <hans.verkuil@cisco.com> | 2016-04-15 09:15:05 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-08 14:30:50 -0300 |
| commit | d16e832da23edff951015f108525ef31ae8dea37 (patch) | |
| tree | 066cc31eeb156bd5d3eb07b82258f8cea8074558 /include/media/videobuf2-dma-contig.h | |
| parent | [media] exynos4-is: Fix buffer release issue on fimc m2m video nodes (diff) | |
| download | wireguard-linux-d16e832da23edff951015f108525ef31ae8dea37.tar.xz wireguard-linux-d16e832da23edff951015f108525ef31ae8dea37.zip | |
[media] vb2: move dma_attrs to vb2_queue
Make the dma attributes struct part of vb2_queue. This greatly simplifies
the remainder of the patch series since the dma_contig alloc context is
now (as before) just a struct device pointer.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media/videobuf2-dma-contig.h')
| -rw-r--r-- | include/media/videobuf2-dma-contig.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h index f7dc8401817e..5bdd4a4072e5 100644 --- a/include/media/videobuf2-dma-contig.h +++ b/include/media/videobuf2-dma-contig.h @@ -26,14 +26,7 @@ vb2_dma_contig_plane_dma_addr(struct vb2_buffer *vb, unsigned int plane_no) return *addr; } -void *vb2_dma_contig_init_ctx_attrs(struct device *dev, - struct dma_attrs *attrs); - -static inline void *vb2_dma_contig_init_ctx(struct device *dev) -{ - return vb2_dma_contig_init_ctx_attrs(dev, NULL); -} - +void *vb2_dma_contig_init_ctx(struct device *dev); void vb2_dma_contig_cleanup_ctx(void *alloc_ctx); int vb2_dma_contig_set_max_seg_size(struct device *dev, unsigned int size); void vb2_dma_contig_clear_max_seg_size(struct device *dev); |