From d2c32e14b694d227b06bda06aabc7b86262a240a Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sat, 24 Sep 2022 09:17:26 +0800 Subject: [PATCH] Revert "dma-buf: system_heap: fix compile warning" This reverts commit 9d91ed824a4afe48109c3f795fe034849df9405d. Use rk_system_heap.c instead of system_heap.c now, reverts all changes. Signed-off-by: Tao Huang Change-Id: Ibb891bd5d9c8a1a56208b8b39402b9b7b04bdd4f --- drivers/dma-buf/heaps/system_heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 8a95d6058088..2a3872d06978 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -270,6 +270,7 @@ system_heap_dma_buf_begin_cpu_access_partial(struct dma_buf *dmabuf, unsigned int len) { struct system_heap_buffer *buffer = dmabuf->priv; + struct sg_table *table = &buffer->sg_table; struct dma_heap_attachment *a; int ret = 0; @@ -279,7 +280,6 @@ system_heap_dma_buf_begin_cpu_access_partial(struct dma_buf *dmabuf, mutex_lock(&buffer->lock); if (IS_ENABLED(CONFIG_SYSTEM_HEAP_FORCE_DMA_SYNC)) { struct dma_heap *heap = buffer->heap; - struct sg_table *table = &buffer->sg_table; ret = system_heap_sgl_sync_range(dma_heap_get_dev(heap), table->sgl, @@ -318,13 +318,13 @@ system_heap_dma_buf_end_cpu_access_partial(struct dma_buf *dmabuf, unsigned int len) { struct system_heap_buffer *buffer = dmabuf->priv; + struct sg_table *table = &buffer->sg_table; struct dma_heap_attachment *a; int ret = 0; mutex_lock(&buffer->lock); if (IS_ENABLED(CONFIG_SYSTEM_HEAP_FORCE_DMA_SYNC)) { struct dma_heap *heap = buffer->heap; - struct sg_table *table = &buffer->sg_table; ret = system_heap_sgl_sync_range(dma_heap_get_dev(heap), table->sgl,