Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / bus / mhi / core / main.c

diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
index fc9196f..b15c5bc 100644 (file)
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -193,7 +193,7 @@ int mhi_map_single_no_bb(struct mhi_controller *mhi_cntrl,
 int mhi_map_single_use_bb(struct mhi_controller *mhi_cntrl,
                          struct mhi_buf_info *buf_info)
 {
-       void *buf = mhi_alloc_coherent(mhi_cntrl, buf_info->len,
+       void *buf = dma_alloc_coherent(mhi_cntrl->cntrl_dev, buf_info->len,
                                       &buf_info->p_addr, GFP_ATOMIC);
 
        if (!buf)
@@ -220,8 +220,8 @@ void mhi_unmap_single_use_bb(struct mhi_controller *mhi_cntrl,
        if (buf_info->dir == DMA_FROM_DEVICE)
                memcpy(buf_info->v_addr, buf_info->bb_addr, buf_info->len);
 
-       mhi_free_coherent(mhi_cntrl, buf_info->len, buf_info->bb_addr,
-                         buf_info->p_addr);
+       dma_free_coherent(mhi_cntrl->cntrl_dev, buf_info->len,
+                         buf_info->bb_addr, buf_info->p_addr);
 }
 
 static int get_nr_avail_ring_elements(struct mhi_controller *mhi_cntrl,