Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / tee / tee_shm.c

diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 0be1e3e93bee5d2a812ef47fdb3d045dd5a4990e..d356d7f025eb4cf92cc3c2f6615a2b8dad6f7e36 100644 (file)
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -61,12 +61,12 @@ static void tee_shm_op_release(struct dma_buf *dmabuf)
        tee_shm_release(shm);
 }
 
-static void *tee_shm_op_kmap_atomic(struct dma_buf *dmabuf, unsigned long pgnum)
+static void *tee_shm_op_map_atomic(struct dma_buf *dmabuf, unsigned long pgnum)
 {
        return NULL;
 }
 
-static void *tee_shm_op_kmap(struct dma_buf *dmabuf, unsigned long pgnum)
+static void *tee_shm_op_map(struct dma_buf *dmabuf, unsigned long pgnum)
 {
        return NULL;
 }
@@ -84,8 +84,8 @@ static 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,
-       .kmap_atomic = tee_shm_op_kmap_atomic,
-       .kmap = tee_shm_op_kmap,
+       .map_atomic = tee_shm_op_map_atomic,
+       .map = tee_shm_op_map,
        .mmap = tee_shm_op_mmap,
 };