From c63b9bb07c082baff8f4f99f7832aaa1d42a586c Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Sat, 26 Mar 2022 08:44:51 +0800 Subject: [PATCH] dma-buf: rk_heaps: move cma heap structs into cma-heap driver The rk_cma_heap and rk_cma_heap_buffer are only used by rk cma heap driver, move them into driver. Signed-off-by: Jianqun Xu Change-Id: I98867254dff5d4092008aa70244bbf9e10c394ac --- drivers/dma-buf/rk_heaps/rk-cma-heap.c | 19 +++++++++++++++++++ drivers/dma-buf/rk_heaps/rk-dma-heap.h | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/dma-buf/rk_heaps/rk-cma-heap.c b/drivers/dma-buf/rk_heaps/rk-cma-heap.c index 37ac163ec12c..47ee96121504 100644 --- a/drivers/dma-buf/rk_heaps/rk-cma-heap.c +++ b/drivers/dma-buf/rk_heaps/rk-cma-heap.c @@ -28,6 +28,25 @@ #include "rk-dma-heap.h" +struct rk_cma_heap { + struct rk_dma_heap *heap; + struct cma *cma; +}; + +struct rk_cma_heap_buffer { + struct rk_cma_heap *heap; + struct list_head attachments; + struct mutex lock; + unsigned long len; + struct page *cma_pages; + struct page **pages; + pgoff_t pagecount; + int vmap_cnt; + void *vaddr; + phys_addr_t phys; + bool attached; +}; + struct rk_cma_heap_attachment { struct device *dev; struct sg_table table; diff --git a/drivers/dma-buf/rk_heaps/rk-dma-heap.h b/drivers/dma-buf/rk_heaps/rk-dma-heap.h index b9ee2fc0d002..afdf6bcfc385 100644 --- a/drivers/dma-buf/rk_heaps/rk-dma-heap.h +++ b/drivers/dma-buf/rk_heaps/rk-dma-heap.h @@ -26,25 +26,6 @@ #define RK_DMA_HEAP_NAME_LEN 16 -struct rk_cma_heap { - struct rk_dma_heap *heap; - struct cma *cma; -}; - -struct rk_cma_heap_buffer { - struct rk_cma_heap *heap; - struct list_head attachments; - struct mutex lock; - unsigned long len; - struct page *cma_pages; - struct page **pages; - pgoff_t pagecount; - int vmap_cnt; - void *vaddr; - phys_addr_t phys; - bool attached; -}; - struct rk_vmap_pfn_data { unsigned long pfn; /* first pfn of contiguous */ pgprot_t prot;