dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro

Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
in highmem.h, the former can be aliased if any dma-buf user includes
that header.

I'm personally trying to include highmem.h inside scatterlist.h and this
breaks the dma-buf code proper.

Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.

To maintain consistency I've renamed all four of kmap* and kunmap* to be
map* and unmap*. (Even though only kmap_atomic presently conflicts.)

[1] https://www.spinics.net/lists/target-devel/msg15070.html

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1492630570-879-1-git-send-email-logang@deltatee.com

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 17e62ecb5d4d..8672f5d2f237 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
         .map_dma_buf = tegra_gem_prime_map_dma_buf,
         .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
         .release = tegra_gem_prime_release,
-        .kmap_atomic = tegra_gem_prime_kmap_atomic,
-        .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
-        .kmap = tegra_gem_prime_kmap,
-        .kunmap = tegra_gem_prime_kunmap,
+        .map_atomic = tegra_gem_prime_kmap_atomic,
+        .unmap_atomic = tegra_gem_prime_kunmap_atomic,
+        .map = tegra_gem_prime_kmap,
+        .unmap = tegra_gem_prime_kunmap,
         .mmap = tegra_gem_prime_mmap,
         .vmap = tegra_gem_prime_vmap,
         .vunmap = tegra_gem_prime_vunmap,