Merge tag 'drm-next-2022-03-24' of git://anongit.freedesktop.org/drm/drm

[uclinux-h8/linux.git] / drivers / media / common / videobuf2 / videobuf2-dma-contig.c

diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index 0e3f264..678b359 100644 (file)
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -99,7 +99,7 @@ static void *vb2_dc_vaddr(struct vb2_buffer *vb, void *buf_priv)
                return buf->vaddr;
 
        if (buf->db_attach) {
-               struct dma_buf_map map;
+               struct iosys_map map;
 
                if (!dma_buf_vmap(buf->db_attach->dmabuf, &map))
                        buf->vaddr = map.vaddr;
@@ -446,7 +446,7 @@ vb2_dc_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,
        return 0;
 }
 
-static int vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf, struct dma_buf_map *map)
+static int vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf, struct iosys_map *map)
 {
        struct vb2_dc_buf *buf;
        void *vaddr;
@@ -456,7 +456,7 @@ static int vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf, struct dma_buf_map *map)
        if (!vaddr)
                return -EINVAL;
 
-       dma_buf_map_set_vaddr(map, vaddr);
+       iosys_map_set_vaddr(map, vaddr);
 
        return 0;
 }
@@ -737,7 +737,7 @@ static void vb2_dc_unmap_dmabuf(void *mem_priv)
 {
        struct vb2_dc_buf *buf = mem_priv;
        struct sg_table *sgt = buf->dma_sgt;
-       struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(buf->vaddr);
+       struct iosys_map map = IOSYS_MAP_INIT_VADDR(buf->vaddr);
 
        if (WARN_ON(!buf->db_attach)) {
                pr_err("trying to unpin a not attached buffer\n");