|
@@ -32,9 +32,9 @@ struct vb2_dc_buf {
|
|
|
struct vb2_vmarea_handler handler;
|
|
|
};
|
|
|
|
|
|
-static void vb2_dma_contig_put(void *buf_priv);
|
|
|
+static void vb2_dc_put(void *buf_priv);
|
|
|
|
|
|
-static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size)
|
|
|
+static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size)
|
|
|
{
|
|
|
struct vb2_dc_conf *conf = alloc_ctx;
|
|
|
struct vb2_dc_buf *buf;
|
|
@@ -56,7 +56,7 @@ static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size)
|
|
|
buf->size = size;
|
|
|
|
|
|
buf->handler.refcount = &buf->refcount;
|
|
|
- buf->handler.put = vb2_dma_contig_put;
|
|
|
+ buf->handler.put = vb2_dc_put;
|
|
|
buf->handler.arg = buf;
|
|
|
|
|
|
atomic_inc(&buf->refcount);
|
|
@@ -64,7 +64,7 @@ static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size)
|
|
|
return buf;
|
|
|
}
|
|
|
|
|
|
-static void vb2_dma_contig_put(void *buf_priv)
|
|
|
+static void vb2_dc_put(void *buf_priv)
|
|
|
{
|
|
|
struct vb2_dc_buf *buf = buf_priv;
|
|
|
|
|
@@ -75,14 +75,14 @@ static void vb2_dma_contig_put(void *buf_priv)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static void *vb2_dma_contig_cookie(void *buf_priv)
|
|
|
+static void *vb2_dc_cookie(void *buf_priv)
|
|
|
{
|
|
|
struct vb2_dc_buf *buf = buf_priv;
|
|
|
|
|
|
return &buf->dma_addr;
|
|
|
}
|
|
|
|
|
|
-static void *vb2_dma_contig_vaddr(void *buf_priv)
|
|
|
+static void *vb2_dc_vaddr(void *buf_priv)
|
|
|
{
|
|
|
struct vb2_dc_buf *buf = buf_priv;
|
|
|
if (!buf)
|
|
@@ -91,14 +91,14 @@ static void *vb2_dma_contig_vaddr(void *buf_priv)
|
|
|
return buf->vaddr;
|
|
|
}
|
|
|
|
|
|
-static unsigned int vb2_dma_contig_num_users(void *buf_priv)
|
|
|
+static unsigned int vb2_dc_num_users(void *buf_priv)
|
|
|
{
|
|
|
struct vb2_dc_buf *buf = buf_priv;
|
|
|
|
|
|
return atomic_read(&buf->refcount);
|
|
|
}
|
|
|
|
|
|
-static int vb2_dma_contig_mmap(void *buf_priv, struct vm_area_struct *vma)
|
|
|
+static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma)
|
|
|
{
|
|
|
struct vb2_dc_buf *buf = buf_priv;
|
|
|
|
|
@@ -111,7 +111,7 @@ static int vb2_dma_contig_mmap(void *buf_priv, struct vm_area_struct *vma)
|
|
|
&vb2_common_vm_ops, &buf->handler);
|
|
|
}
|
|
|
|
|
|
-static void *vb2_dma_contig_get_userptr(void *alloc_ctx, unsigned long vaddr,
|
|
|
+static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
|
|
|
unsigned long size, int write)
|
|
|
{
|
|
|
struct vb2_dc_buf *buf;
|
|
@@ -138,7 +138,7 @@ static void *vb2_dma_contig_get_userptr(void *alloc_ctx, unsigned long vaddr,
|
|
|
return buf;
|
|
|
}
|
|
|
|
|
|
-static void vb2_dma_contig_put_userptr(void *mem_priv)
|
|
|
+static void vb2_dc_put_userptr(void *mem_priv)
|
|
|
{
|
|
|
struct vb2_dc_buf *buf = mem_priv;
|
|
|
|
|
@@ -150,14 +150,14 @@ static void vb2_dma_contig_put_userptr(void *mem_priv)
|
|
|
}
|
|
|
|
|
|
const struct vb2_mem_ops vb2_dma_contig_memops = {
|
|
|
- .alloc = vb2_dma_contig_alloc,
|
|
|
- .put = vb2_dma_contig_put,
|
|
|
- .cookie = vb2_dma_contig_cookie,
|
|
|
- .vaddr = vb2_dma_contig_vaddr,
|
|
|
- .mmap = vb2_dma_contig_mmap,
|
|
|
- .get_userptr = vb2_dma_contig_get_userptr,
|
|
|
- .put_userptr = vb2_dma_contig_put_userptr,
|
|
|
- .num_users = vb2_dma_contig_num_users,
|
|
|
+ .alloc = vb2_dc_alloc,
|
|
|
+ .put = vb2_dc_put,
|
|
|
+ .cookie = vb2_dc_cookie,
|
|
|
+ .vaddr = vb2_dc_vaddr,
|
|
|
+ .mmap = vb2_dc_mmap,
|
|
|
+ .get_userptr = vb2_dc_get_userptr,
|
|
|
+ .put_userptr = vb2_dc_put_userptr,
|
|
|
+ .num_users = vb2_dc_num_users,
|
|
|
};
|
|
|
EXPORT_SYMBOL_GPL(vb2_dma_contig_memops);
|
|
|
|