Revert "dma-buf: cma_heap: Fix compile warning when !CONFIG_NO_GKI"

This reverts commit 78a3c0db57.
Convert to use rk_cma_heap.c

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I799107c485187d99f1c71e58ede360865337cf3e
This commit is contained in:
Jianqun Xu
2022-09-26 14:46:05 +08:00
committed by Tao Huang
parent e8bbe70394
commit 449b29d7ab

View File

@@ -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,