diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 4dc7ae72922f1..8ddd821914e7f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -300,7 +300,7 @@ static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state
 	}
 
 	g_dma_dev = dma_dev ?: dev;
-	g_dma_pool = dmam_pool_create("vchiq_scatter_pool", dev,
+	g_dma_pool = dmam_pool_create("vchiq_scatter_pool", g_dma_dev,
 				      VCHIQ_DMA_POOL_SIZE,
 				      drv_mgmt->info->cache_line_size, 0);
 	if (!g_dma_pool) {
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index a9f382430bfbd..574a3b0de1c24 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -1547,7 +1547,7 @@ create_pagelist(struct vchiq_instance *instance, struct vchiq_bulk *bulk)
 	 * list
 	 */
 	if (pagelist_size > VCHIQ_DMA_POOL_SIZE) {
-		pagelist = dma_alloc_coherent(instance->state->dev, pagelist_size, &dma_addr,
+		pagelist = dma_alloc_coherent(g_dma_dev, pagelist_size, &dma_addr,
 						GFP_KERNEL);
 		is_from_pool = false;
 	} else {
@@ -1641,7 +1641,7 @@ create_pagelist(struct vchiq_instance *instance, struct vchiq_bulk *bulk)
 		count -= len;
 	}
 
-	dma_buffers = dma_map_sg(instance->state->dev,
+	dma_buffers = dma_map_sg(g_dma_dev,
 				 scatterlist,
 				 num_pages,
 				 pagelistinfo->dma_dir);