dma-buf: Remove leftover [un]map_atomic comments
PATCH 1/2 dma-buf: Remove leftover [un]map_atomic comments
The map_atomic/unmap_atomic callbacks have been removed, remove the related comments.
Fixes f664a5269542 ("dma-buf: remove kmap_atomic interface")
Signed-off-by Andrew F. Davis <[email protected]>
--- include/linux/dma-buf.h | 5 ----- 1 file changed, 5 deletions(-)
include/linux/dma-buf.h +0 -5
@@ -39,11 +39,6 @@ struct dma_buf_attachment;/** * struct dma_buf_ops - operations possible on struct dma_buf -* @map_atomic: [optional] maps a page from the buffer into kernel address -* space, users may not block until the subsequent unmap call. -* This callback must not sleep. -* @unmap_atomic: [optional] unmaps a atomically mapped page from the buffer. -* This Callback must not sleep. * @map: [optional] maps a page from the buffer into kernel address space. * @unmap: [optional] unmaps a page from the buffer. * @vmap: [optional] creates a virtual mapping for the buffer into kernel
Signature · 1 line
2.21.0
PATCH 2/2 dma-buf: Update [un]map documentation to match the other functions
Other function have inline documentation, a couple still have theirs at the top of the structure, update the docs and move them inline.
Signed-off-by Andrew F. Davis <[email protected]>
--- include/linux/dma-buf.h | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
include/linux/dma-buf.h +25 -4
@@ -39,8 +39,6 @@ struct dma_buf_attachment;/** * struct dma_buf_ops - operations possible on struct dma_buf -* @map: [optional] maps a page from the buffer into kernel address space. -* @unmap: [optional] unmaps a page from the buffer. * @vmap: [optional] creates a virtual mapping for the buffer into kernel * address space. Same restrictions as for vmap and friends apply. * @vunmap: [optional] unmaps a vmap from the buffer
@@ -200,8 +198,6 @@ struct dma_buf_ops {* to be restarted. */ int (*end_cpu_access)(struct dma_buf *,enum dma_data_direction ); -void *(*map)(struct dma_buf *,unsigned long ); -void (*unmap)(struct dma_buf *,unsigned long ,void *);/** * @mmap:
@@ -240,6 +236,31 @@ struct dma_buf_ops {*/ int (*mmap)(struct dma_buf *,struct vm_area_struct *vma); +/** +* @map: +* +* Maps a page from the buffer into kernel address space. The page is +* specified by offset into the buffer in PAGE_SIZE units. +* +* This callback is optional. +* +* Returns: +* +* Virtual address pointer where requested page can be accessed. NULL +* on error or when this function is unimplemented by the exporter. +*/ +void *(*map)(struct dma_buf *,unsigned long ); + +/** +* @unmap: +* +* Unmaps a page from the buffer. Page offset and address pointer should +* be the same as the one passed to and returned by matching call to map. +* +* This callback is optional. +*/ +void (*unmap)(struct dma_buf *,unsigned long ,void *); +void *(*vmap)(struct dma_buf *);void (*vunmap)(struct dma_buf *,void *vaddr); };
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel