From 38bb79482f8e473f89bde98287776de2061a0d8c Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Wed, 8 Dec 2021 19:01:08 +0800
Subject: [PATCH] dma-buf: Rename dma-cache to dma-buf-cache

As same as 4.19.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaa6ab536cba6e83e120983316f183dbaceb7e030
---
 drivers/dma-buf/Makefile                         | 2 +-
 drivers/dma-buf/{dma-cache.c => dma-buf-cache.c} | 2 +-
 drivers/video/rockchip/mpp/mpp_iommu.c           | 5 +----
 drivers/video/rockchip/rga3/include/rga_drv.h    | 2 +-
 include/linux/{dma-cache.h => dma-buf-cache.h}   | 0
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename drivers/dma-buf/{dma-cache.c => dma-buf-cache.c} (99%)
 rename include/linux/{dma-cache.h => dma-buf-cache.h} (100%)

diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile
index a6257637fe35..b2b9484eefa4 100644
--- a/drivers/dma-buf/Makefile
+++ b/drivers/dma-buf/Makefile
@@ -3,7 +3,7 @@ obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
 	 dma-resv.o seqno-fence.o
 obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
 obj-$(CONFIG_DMABUF_HEAPS)	+= heaps/
-obj-$(CONFIG_DMABUF_CACHE)	+= dma-cache.o
+obj-$(CONFIG_DMABUF_CACHE)	+= dma-buf-cache.o
 obj-$(CONFIG_SYNC_FILE)		+= sync_file.o
 obj-$(CONFIG_SW_SYNC)		+= sw_sync.o
 obj-$(CONFIG_SW_SYNC_DEBUG)	+= sync_debug.o
diff --git a/drivers/dma-buf/dma-cache.c b/drivers/dma-buf/dma-buf-cache.c
similarity index 99%
rename from drivers/dma-buf/dma-cache.c
rename to drivers/dma-buf/dma-buf-cache.c
index 62c62d401183..79f35d359241 100644
--- a/drivers/dma-buf/dma-cache.c
+++ b/drivers/dma-buf/dma-buf-cache.c
@@ -6,7 +6,7 @@
 #include <linux/slab.h>
 #include <linux/dma-buf.h>
 #undef CONFIG_DMABUF_CACHE
-#include <linux/dma-cache.h>
+#include <linux/dma-buf-cache.h>
 
 struct dma_buf_cache_list {
 	struct list_head head;
diff --git a/drivers/video/rockchip/mpp/mpp_iommu.c b/drivers/video/rockchip/mpp/mpp_iommu.c
index e279f4f43489..a23be457e2b0 100644
--- a/drivers/video/rockchip/mpp/mpp_iommu.c
+++ b/drivers/video/rockchip/mpp/mpp_iommu.c
@@ -9,10 +9,7 @@
  *
  */
 #include <linux/delay.h>
-#ifdef CONFIG_DMABUF_CACHE
-#include <linux/dma-cache.h>
-#endif
-#include <linux/dma-buf.h>
+#include <linux/dma-buf-cache.h>
 #include <linux/dma-iommu.h>
 #include <linux/iommu.h>
 #include <linux/of.h>
diff --git a/drivers/video/rockchip/rga3/include/rga_drv.h b/drivers/video/rockchip/rga3/include/rga_drv.h
index d2ea3feb3967..0ee56f27c529 100644
--- a/drivers/video/rockchip/rga3/include/rga_drv.h
+++ b/drivers/video/rockchip/rga3/include/rga_drv.h
@@ -13,7 +13,7 @@
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/dma-cache.h>
+#include <linux/dma-buf-cache.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/fb.h>
diff --git a/include/linux/dma-cache.h b/include/linux/dma-buf-cache.h
similarity index 100%
rename from include/linux/dma-cache.h
rename to include/linux/dma-buf-cache.h