From d9a4e54f9ca627f12ccdd8522a14192fd2034ed1 Mon Sep 17 00:00:00 2001 From: Elon Zhang Date: Tue, 25 Jun 2019 12:00:00 +0800 Subject: [PATCH] OP-TEE: modify _tee_shm_dma_buf_ops to match new 'struct dma_buf_ops' Change-Id: Ia52642af4da1928f19c9091e54d272073fa3edbf Signed-off-by: Elon Zhang --- security/optee_linuxdriver/core/tee_shm.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/security/optee_linuxdriver/core/tee_shm.c b/security/optee_linuxdriver/core/tee_shm.c index 8c0d11d9b9be..4b09789ddceb 100644 --- a/security/optee_linuxdriver/core/tee_shm.c +++ b/security/optee_linuxdriver/core/tee_shm.c @@ -146,7 +146,6 @@ void rk_tee_shm_free(struct tee_shm *shm) } static int _tee_shm_attach_dma_buf(struct dma_buf *dmabuf, - struct device *dev, struct dma_buf_attachment *attach) { struct tee_shm_attach *tee_shm_attach; @@ -319,12 +318,6 @@ static int _tee_shm_dma_buf_mmap(struct dma_buf *dmabuf, return ret; } -static void *_tee_shm_dma_buf_kmap_atomic(struct dma_buf *dmabuf, - unsigned long pgnum) -{ - return NULL; -} - static void *_tee_shm_dma_buf_kmap(struct dma_buf *db, unsigned long pgnum) { struct tee_shm *shm = db->priv; @@ -351,9 +344,8 @@ struct dma_buf_ops _tee_shm_dma_buf_ops = { .map_dma_buf = _tee_shm_dma_buf_map_dma_buf, .unmap_dma_buf = _tee_shm_dma_buf_unmap_dma_buf, .release = _tee_shm_dma_buf_release, - .kmap_atomic = _tee_shm_dma_buf_kmap_atomic, - .kmap = _tee_shm_dma_buf_kmap, - .kunmap = _tee_shm_dma_buf_kunmap, + .map = _tee_shm_dma_buf_kmap, + .unmap = _tee_shm_dma_buf_kunmap, .mmap = _tee_shm_dma_buf_mmap, };