1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 221faed9f074..e93845c26bdb 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -91,9 +91,9 @@ static bool ux500_configure_channel(struct dma_channel *channel,
         struct scatterlist sg;
         struct dma_slave_config slave_conf;
         enum dma_slave_buswidth addr_width;
-        dma_addr_t usb_fifo_addr = (MUSB_FIFO_OFFSET(hw_ep->epnum) +
-                                        ux500_channel->controller->phy_base);
         struct musb *musb = ux500_channel->controller->private_data;
+        dma_addr_t usb_fifo_addr = (musb->io.fifo_offset(hw_ep->epnum) +
+                                        ux500_channel->controller->phy_base);
 
         dev_dbg(musb->controller,
                 "packet_sz=%d, mode=%d, dma_addr=0x%llx, len=%d is_tx=%d\n",
@@ -121,8 +121,7 @@ static bool ux500_configure_channel(struct dma_channel *channel,
         slave_conf.dst_maxburst = 16;
         slave_conf.device_fc = false;
 
-        dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
-                                             (unsigned long) &slave_conf);
+        dmaengine_slave_config(dma_chan, &slave_conf);
 
         dma_desc = dmaengine_prep_slave_sg(dma_chan, &sg, 1, direction,
                                              DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
@@ -246,9 +245,7 @@ static int ux500_dma_channel_abort(struct dma_channel *channel)
                         musb_writew(epio, MUSB_RXCSR, csr);
                 }
 
-                ux500_channel->dma_chan->device->
-                                device_control(ux500_channel->dma_chan,
-                                        DMA_TERMINATE_ALL, 0);
+                dmaengine_terminate_all(ux500_channel->dma_chan);
                 channel->status = MUSB_DMA_STATUS_FREE;
         }
         return 0;