| Message ID | 20191118103536.17675-13-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Retire dma_buf_k(un)map | expand |
On Mon, Nov 18, 2019 at 11:35:33AM +0100, Daniel Vetter wrote: > There's no in-tree users anymore. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Jens Wiklander <jens.wiklander@linaro.org> > Cc: tee-dev@lists.linaro.org > -- > Ack for merging this through drm trees very much appreciated. > -Daniel Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On Mon, Nov 18, 2019 at 11:35:33AM +0100, Daniel Vetter wrote: > There's no in-tree users anymore. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Jens Wiklander <jens.wiklander@linaro.org> > Cc: tee-dev@lists.linaro.org > -- > Ack for merging this through drm trees very much appreciated. > -Daniel Acked-by: Jens Wiklander <jens.wiklander@linaro.org> Cheers, Jens
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 1b1a794d639d..d0cbef9ec28a 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -555,13 +555,6 @@ static void fastrpc_dma_buf_detatch(struct dma_buf *dmabuf, kfree(a); } -static void *fastrpc_kmap(struct dma_buf *dmabuf, unsigned long pgnum) -{ - struct fastrpc_buf *buf = dmabuf->priv; - - return buf->virt ? buf->virt + pgnum * PAGE_SIZE : NULL; -} - static void *fastrpc_vmap(struct dma_buf *dmabuf) { struct fastrpc_buf *buf = dmabuf->priv; @@ -585,7 +578,6 @@ static const struct dma_buf_ops fastrpc_dma_buf_ops = { .map_dma_buf = fastrpc_map_dma_buf, .unmap_dma_buf = fastrpc_unmap_dma_buf, .mmap = fastrpc_mmap, - .map = fastrpc_kmap, .vmap = fastrpc_vmap, .release = fastrpc_release, }; diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 09ddcd06c715..937ac5aaa6d8 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -71,11 +71,6 @@ static void tee_shm_op_release(struct dma_buf *dmabuf) tee_shm_release(shm); } -static void *tee_shm_op_map(struct dma_buf *dmabuf, unsigned long pgnum) -{ - return NULL; -} - static int tee_shm_op_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) { struct tee_shm *shm = dmabuf->priv; @@ -93,7 +88,6 @@ static const struct dma_buf_ops tee_shm_dma_buf_ops = { .map_dma_buf = tee_shm_op_map_dma_buf, .unmap_dma_buf = tee_shm_op_unmap_dma_buf, .release = tee_shm_op_release, - .map = tee_shm_op_map, .mmap = tee_shm_op_mmap, };
There's no in-tree users anymore. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jens Wiklander <jens.wiklander@linaro.org> Cc: tee-dev@lists.linaro.org -- Ack for merging this through drm trees very much appreciated. -Daniel --- drivers/misc/fastrpc.c | 8 -------- drivers/tee/tee_shm.c | 6 ------ 2 files changed, 14 deletions(-)