On Mon, Nov 18, 2019 at 11:35:26AM +0100, Daniel Vetter wrote: > It's a dummy anyway. > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > Cc: Russell King <linux@xxxxxxxxxxxxxxx> I merged the entire series except this one and the final patch, sill waiting a bit more for an ack on this perhaps. -Daniel > --- > drivers/gpu/drm/armada/armada_gem.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c > index 93cf8b8bfcff..976685f2939e 100644 > --- a/drivers/gpu/drm/armada/armada_gem.c > +++ b/drivers/gpu/drm/armada/armada_gem.c > @@ -461,16 +461,6 @@ static void armada_gem_prime_unmap_dma_buf(struct dma_buf_attachment *attach, > kfree(sgt); > } > > -static void *armada_gem_dmabuf_no_kmap(struct dma_buf *buf, unsigned long n) > -{ > - return NULL; > -} > - > -static void > -armada_gem_dmabuf_no_kunmap(struct dma_buf *buf, unsigned long n, void *addr) > -{ > -} > - > static int > armada_gem_dmabuf_mmap(struct dma_buf *buf, struct vm_area_struct *vma) > { > @@ -481,8 +471,6 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = { > .map_dma_buf = armada_gem_prime_map_dma_buf, > .unmap_dma_buf = armada_gem_prime_unmap_dma_buf, > .release = drm_gem_dmabuf_release, > - .map = armada_gem_dmabuf_no_kmap, > - .unmap = armada_gem_dmabuf_no_kunmap, > .mmap = armada_gem_dmabuf_mmap, > }; > > -- > 2.24.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel