| Message ID | 20191118103536.17675-12-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On 18.11.2019 11:35, Daniel Vetter wrote: > No in-tree users left. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Pawel Osciak <pawel@osciak.com> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Tomasz Figa <tfiga@chromium.org> > Cc: linux-media@vger.kernel.org Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> > -- > Ack for merging this through drm trees very much appreciated. > -Daniel > --- > drivers/media/common/videobuf2/videobuf2-dma-contig.c | 8 -------- > drivers/media/common/videobuf2/videobuf2-dma-sg.c | 8 -------- > drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 -------- > 3 files changed, 24 deletions(-) > > diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c > index 44cd0e530bbd..d0c9dffe49e5 100644 > --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c > +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c > @@ -335,13 +335,6 @@ static void vb2_dc_dmabuf_ops_release(struct dma_buf *dbuf) > vb2_dc_put(dbuf->priv); > } > > -static void *vb2_dc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) > -{ > - struct vb2_dc_buf *buf = dbuf->priv; > - > - return buf->vaddr ? buf->vaddr + pgnum * PAGE_SIZE : NULL; > -} > - > static void *vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf) > { > struct vb2_dc_buf *buf = dbuf->priv; > @@ -360,7 +353,6 @@ static const struct dma_buf_ops vb2_dc_dmabuf_ops = { > .detach = vb2_dc_dmabuf_ops_detach, > .map_dma_buf = vb2_dc_dmabuf_ops_map, > .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap, > - .map = vb2_dc_dmabuf_ops_kmap, > .vmap = vb2_dc_dmabuf_ops_vmap, > .mmap = vb2_dc_dmabuf_ops_mmap, > .release = vb2_dc_dmabuf_ops_release, > diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c > index ed706b2a263c..6db60e9d5183 100644 > --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c > +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c > @@ -470,13 +470,6 @@ static void vb2_dma_sg_dmabuf_ops_release(struct dma_buf *dbuf) > vb2_dma_sg_put(dbuf->priv); > } > > -static void *vb2_dma_sg_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) > -{ > - struct vb2_dma_sg_buf *buf = dbuf->priv; > - > - return buf->vaddr ? buf->vaddr + pgnum * PAGE_SIZE : NULL; > -} > - > static void *vb2_dma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf) > { > struct vb2_dma_sg_buf *buf = dbuf->priv; > @@ -495,7 +488,6 @@ static const struct dma_buf_ops vb2_dma_sg_dmabuf_ops = { > .detach = vb2_dma_sg_dmabuf_ops_detach, > .map_dma_buf = vb2_dma_sg_dmabuf_ops_map, > .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap, > - .map = vb2_dma_sg_dmabuf_ops_kmap, > .vmap = vb2_dma_sg_dmabuf_ops_vmap, > .mmap = vb2_dma_sg_dmabuf_ops_mmap, > .release = vb2_dma_sg_dmabuf_ops_release, > diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c > index 04d51ca63223..4d5af352e249 100644 > --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c > +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c > @@ -319,13 +319,6 @@ static void vb2_vmalloc_dmabuf_ops_release(struct dma_buf *dbuf) > vb2_vmalloc_put(dbuf->priv); > } > > -static void *vb2_vmalloc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) > -{ > - struct vb2_vmalloc_buf *buf = dbuf->priv; > - > - return buf->vaddr + pgnum * PAGE_SIZE; > -} > - > static void *vb2_vmalloc_dmabuf_ops_vmap(struct dma_buf *dbuf) > { > struct vb2_vmalloc_buf *buf = dbuf->priv; > @@ -344,7 +337,6 @@ static const struct dma_buf_ops vb2_vmalloc_dmabuf_ops = { > .detach = vb2_vmalloc_dmabuf_ops_detach, > .map_dma_buf = vb2_vmalloc_dmabuf_ops_map, > .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap, > - .map = vb2_vmalloc_dmabuf_ops_kmap, > .vmap = vb2_vmalloc_dmabuf_ops_vmap, > .mmap = vb2_vmalloc_dmabuf_ops_mmap, > .release = vb2_vmalloc_dmabuf_ops_release, Best regards
On 11/18/19 11:35 AM, Daniel Vetter wrote: > No in-tree users left. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Thanks! Hans > Cc: Pawel Osciak <pawel@osciak.com> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Tomasz Figa <tfiga@chromium.org> > Cc: linux-media@vger.kernel.org > -- > Ack for merging this through drm trees very much appreciated. > -Daniel > --- > drivers/media/common/videobuf2/videobuf2-dma-contig.c | 8 -------- > drivers/media/common/videobuf2/videobuf2-dma-sg.c | 8 -------- > drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 -------- > 3 files changed, 24 deletions(-) > > diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c > index 44cd0e530bbd..d0c9dffe49e5 100644 > --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c > +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c > @@ -335,13 +335,6 @@ static void vb2_dc_dmabuf_ops_release(struct dma_buf *dbuf) > vb2_dc_put(dbuf->priv); > } > > -static void *vb2_dc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) > -{ > - struct vb2_dc_buf *buf = dbuf->priv; > - > - return buf->vaddr ? buf->vaddr + pgnum * PAGE_SIZE : NULL; > -} > - > static void *vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf) > { > struct vb2_dc_buf *buf = dbuf->priv; > @@ -360,7 +353,6 @@ static const struct dma_buf_ops vb2_dc_dmabuf_ops = { > .detach = vb2_dc_dmabuf_ops_detach, > .map_dma_buf = vb2_dc_dmabuf_ops_map, > .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap, > - .map = vb2_dc_dmabuf_ops_kmap, > .vmap = vb2_dc_dmabuf_ops_vmap, > .mmap = vb2_dc_dmabuf_ops_mmap, > .release = vb2_dc_dmabuf_ops_release, > diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c > index ed706b2a263c..6db60e9d5183 100644 > --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c > +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c > @@ -470,13 +470,6 @@ static void vb2_dma_sg_dmabuf_ops_release(struct dma_buf *dbuf) > vb2_dma_sg_put(dbuf->priv); > } > > -static void *vb2_dma_sg_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) > -{ > - struct vb2_dma_sg_buf *buf = dbuf->priv; > - > - return buf->vaddr ? buf->vaddr + pgnum * PAGE_SIZE : NULL; > -} > - > static void *vb2_dma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf) > { > struct vb2_dma_sg_buf *buf = dbuf->priv; > @@ -495,7 +488,6 @@ static const struct dma_buf_ops vb2_dma_sg_dmabuf_ops = { > .detach = vb2_dma_sg_dmabuf_ops_detach, > .map_dma_buf = vb2_dma_sg_dmabuf_ops_map, > .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap, > - .map = vb2_dma_sg_dmabuf_ops_kmap, > .vmap = vb2_dma_sg_dmabuf_ops_vmap, > .mmap = vb2_dma_sg_dmabuf_ops_mmap, > .release = vb2_dma_sg_dmabuf_ops_release, > diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c > index 04d51ca63223..4d5af352e249 100644 > --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c > +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c > @@ -319,13 +319,6 @@ static void vb2_vmalloc_dmabuf_ops_release(struct dma_buf *dbuf) > vb2_vmalloc_put(dbuf->priv); > } > > -static void *vb2_vmalloc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) > -{ > - struct vb2_vmalloc_buf *buf = dbuf->priv; > - > - return buf->vaddr + pgnum * PAGE_SIZE; > -} > - > static void *vb2_vmalloc_dmabuf_ops_vmap(struct dma_buf *dbuf) > { > struct vb2_vmalloc_buf *buf = dbuf->priv; > @@ -344,7 +337,6 @@ static const struct dma_buf_ops vb2_vmalloc_dmabuf_ops = { > .detach = vb2_vmalloc_dmabuf_ops_detach, > .map_dma_buf = vb2_vmalloc_dmabuf_ops_map, > .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap, > - .map = vb2_vmalloc_dmabuf_ops_kmap, > .vmap = vb2_vmalloc_dmabuf_ops_vmap, > .mmap = vb2_vmalloc_dmabuf_ops_mmap, > .release = vb2_vmalloc_dmabuf_ops_release, >
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c index 44cd0e530bbd..d0c9dffe49e5 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c @@ -335,13 +335,6 @@ static void vb2_dc_dmabuf_ops_release(struct dma_buf *dbuf) vb2_dc_put(dbuf->priv); } -static void *vb2_dc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) -{ - struct vb2_dc_buf *buf = dbuf->priv; - - return buf->vaddr ? buf->vaddr + pgnum * PAGE_SIZE : NULL; -} - static void *vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf) { struct vb2_dc_buf *buf = dbuf->priv; @@ -360,7 +353,6 @@ static const struct dma_buf_ops vb2_dc_dmabuf_ops = { .detach = vb2_dc_dmabuf_ops_detach, .map_dma_buf = vb2_dc_dmabuf_ops_map, .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap, - .map = vb2_dc_dmabuf_ops_kmap, .vmap = vb2_dc_dmabuf_ops_vmap, .mmap = vb2_dc_dmabuf_ops_mmap, .release = vb2_dc_dmabuf_ops_release, diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c index ed706b2a263c..6db60e9d5183 100644 --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c @@ -470,13 +470,6 @@ static void vb2_dma_sg_dmabuf_ops_release(struct dma_buf *dbuf) vb2_dma_sg_put(dbuf->priv); } -static void *vb2_dma_sg_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) -{ - struct vb2_dma_sg_buf *buf = dbuf->priv; - - return buf->vaddr ? buf->vaddr + pgnum * PAGE_SIZE : NULL; -} - static void *vb2_dma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf) { struct vb2_dma_sg_buf *buf = dbuf->priv; @@ -495,7 +488,6 @@ static const struct dma_buf_ops vb2_dma_sg_dmabuf_ops = { .detach = vb2_dma_sg_dmabuf_ops_detach, .map_dma_buf = vb2_dma_sg_dmabuf_ops_map, .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap, - .map = vb2_dma_sg_dmabuf_ops_kmap, .vmap = vb2_dma_sg_dmabuf_ops_vmap, .mmap = vb2_dma_sg_dmabuf_ops_mmap, .release = vb2_dma_sg_dmabuf_ops_release, diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c index 04d51ca63223..4d5af352e249 100644 --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c @@ -319,13 +319,6 @@ static void vb2_vmalloc_dmabuf_ops_release(struct dma_buf *dbuf) vb2_vmalloc_put(dbuf->priv); } -static void *vb2_vmalloc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) -{ - struct vb2_vmalloc_buf *buf = dbuf->priv; - - return buf->vaddr + pgnum * PAGE_SIZE; -} - static void *vb2_vmalloc_dmabuf_ops_vmap(struct dma_buf *dbuf) { struct vb2_vmalloc_buf *buf = dbuf->priv; @@ -344,7 +337,6 @@ static const struct dma_buf_ops vb2_vmalloc_dmabuf_ops = { .detach = vb2_vmalloc_dmabuf_ops_detach, .map_dma_buf = vb2_vmalloc_dmabuf_ops_map, .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap, - .map = vb2_vmalloc_dmabuf_ops_kmap, .vmap = vb2_vmalloc_dmabuf_ops_vmap, .mmap = vb2_vmalloc_dmabuf_ops_mmap, .release = vb2_vmalloc_dmabuf_ops_release,
No in-tree users left. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Pawel Osciak <pawel@osciak.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Tomasz Figa <tfiga@chromium.org> Cc: linux-media@vger.kernel.org -- Ack for merging this through drm trees very much appreciated. -Daniel --- drivers/media/common/videobuf2/videobuf2-dma-contig.c | 8 -------- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 8 -------- drivers/media/common/videobuf2/videobuf2-vmalloc.c | 8 -------- 3 files changed, 24 deletions(-)