diff --git a/src/ipc/ipc4/dai.c b/src/ipc/ipc4/dai.c
index 58c08d9ec04b..1540d95cf0f0 100644
--- a/src/ipc/ipc4/dai.c
+++ b/src/ipc/ipc4/dai.c
@@ -236,9 +236,9 @@ void dai_dma_release(struct dai_data *dd, struct comp_dev *dev)
 		 * TODO: refine power management when stream is paused
 		 */
 		/* if reset is after pause dma has already been stopped */
-		dma_stop(dd->dma->z_dev, dd->chan_index);
+		sof_dma_stop(dd->dma, dd->chan_index);
 
-		dma_release_channel(dd->dma->z_dev, dd->chan_index);
+		sof_dma_release_channel(dd->dma, dd->chan_index);
 		dd->chan_index = -EINVAL;
 	}
 }
@@ -450,7 +450,7 @@ void dai_dma_position_update(struct dai_data *dd, struct comp_dev *dev)
 	if (!dd->slot_info.node_id)
 		return;
 
-	ret = dma_get_status(dd->dma->z_dev, dd->chan_index, &status);
+	ret = sof_dma_get_status(dd->dma, dd->chan_index, &status);
 	if (ret < 0)
 		return;
 
diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c
index 8e3073ab7797..1798de75342d 100644
--- a/src/ipc/ipc4/helper.c
+++ b/src/ipc/ipc4/helper.c
@@ -1131,11 +1131,19 @@ __cold static const struct comp_driver *ipc4_search_for_drv(const void *uuid)
 	struct list_item *clist;
 	const struct comp_driver *drv = NULL;
 	struct comp_driver_info *info;
+#ifndef CONFIG_SOF_USERSPACE_LL
 	uint32_t flags;
+#endif
 
 	assert_can_be_cold();
 
+	/* Driver list is populated at boot before IPC processing starts.
+	 * In user-space builds irq_local_disable() is privileged, but the
+	 * list is immutable by this point so no lock is needed.
+	 */
+#ifndef CONFIG_SOF_USERSPACE_LL
 	irq_local_disable(flags);
+#endif
 
 	/* search driver list with UUID */
 	list_for_item(clist, &drivers->list) {
@@ -1151,7 +1159,9 @@ __cold static const struct comp_driver *ipc4_search_for_drv(const void *uuid)
 		}
 	}
 
+#ifndef CONFIG_SOF_USERSPACE_LL
 	irq_local_enable(flags);
+#endif
 	return drv;
 }