From 449b29d7ab04ec2149a29d293562887cbcc51692 Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Mon, 26 Sep 2022 14:46:05 +0800 Subject: [PATCH] Revert "dma-buf: cma_heap: Fix compile warning when !CONFIG_NO_GKI" This reverts commit 78a3c0db57b0f742898309e6aa270c81595f2ac2. Convert to use rk_cma_heap.c Signed-off-by: Jianqun Xu Change-Id: I799107c485187d99f1c71e58ede360865337cf3e --- drivers/dma-buf/heaps/cma_heap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 803f523cd3e5..ab6f937eb60d 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -441,7 +441,6 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap *heap, return cma_heap_do_allocate(heap, len, fd_flags, heap_flags, false); } -#if IS_ENABLED(CONFIG_NO_GKI) static int cma_heap_get_phys(struct dma_heap *heap, struct dma_heap_phys_data *phys) { @@ -472,7 +471,6 @@ err: return (phys->paddr == (__u64)-1) ? -EINVAL : 0; } -#endif static const struct dma_heap_ops cma_heap_ops = { .allocate = cma_heap_allocate,