diff --git a/drivers/dma-buf/rk_heaps/rk-cma-heap.c b/drivers/dma-buf/rk_heaps/rk-cma-heap.c
index 985ba7839462..37ac163ec12c 100644
--- a/drivers/dma-buf/rk_heaps/rk-cma-heap.c
+++ b/drivers/dma-buf/rk_heaps/rk-cma-heap.c
@@ -28,7 +28,7 @@
 
 #include "rk-dma-heap.h"
 
-struct rk_dma_heap_attachment {
+struct rk_cma_heap_attachment {
 	struct device *dev;
 	struct sg_table table;
 	struct list_head list;
@@ -39,7 +39,7 @@ static int rk_cma_heap_attach(struct dma_buf *dmabuf,
 			      struct dma_buf_attachment *attachment)
 {
 	struct rk_cma_heap_buffer *buffer = dmabuf->priv;
-	struct rk_dma_heap_attachment *a;
+	struct rk_cma_heap_attachment *a;
 	struct sg_table *table;
 	size_t size = buffer->pagecount << PAGE_SHIFT;
 	int ret;
@@ -76,7 +76,7 @@ static void rk_cma_heap_detach(struct dma_buf *dmabuf,
 			       struct dma_buf_attachment *attachment)
 {
 	struct rk_cma_heap_buffer *buffer = dmabuf->priv;
-	struct rk_dma_heap_attachment *a = attachment->priv;
+	struct rk_cma_heap_attachment *a = attachment->priv;
 
 	mutex_lock(&buffer->lock);
 	list_del(&a->list);
@@ -91,7 +91,7 @@ static void rk_cma_heap_detach(struct dma_buf *dmabuf,
 static struct sg_table *rk_cma_heap_map_dma_buf(struct dma_buf_attachment *attachment,
 						enum dma_data_direction direction)
 {
-	struct rk_dma_heap_attachment *a = attachment->priv;
+	struct rk_cma_heap_attachment *a = attachment->priv;
 	struct sg_table *table = &a->table;
 	int attrs = attachment->dma_map_attrs;
 	int ret;
@@ -107,7 +107,7 @@ static void rk_cma_heap_unmap_dma_buf(struct dma_buf_attachment *attachment,
 				      struct sg_table *table,
 				      enum dma_data_direction direction)
 {
-	struct rk_dma_heap_attachment *a = attachment->priv;
+	struct rk_cma_heap_attachment *a = attachment->priv;
 	int attrs = attachment->dma_map_attrs;
 
 	a->mapped = false;
@@ -121,7 +121,7 @@ rk_cma_heap_dma_buf_begin_cpu_access_partial(struct dma_buf *dmabuf,
 					     unsigned int len)
 {
 	struct rk_cma_heap_buffer *buffer = dmabuf->priv;
-	struct rk_dma_heap_attachment *a;
+	struct rk_cma_heap_attachment *a;
 
 	if (buffer->vmap_cnt)
 		invalidate_kernel_vmap_range(buffer->vaddr, buffer->len);
@@ -151,7 +151,7 @@ rk_cma_heap_dma_buf_end_cpu_access_partial(struct dma_buf *dmabuf,
 					   unsigned int len)
 {
 	struct rk_cma_heap_buffer *buffer = dmabuf->priv;
-	struct rk_dma_heap_attachment *a;
+	struct rk_cma_heap_attachment *a;
 
 	if (buffer->vmap_cnt)
 		flush_kernel_vmap_range(buffer->vaddr, buffer->len);