4 files changed, 7 insertions, 7 deletions

diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 97cb45916c43..d05c7fbbb703 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -115,12 +115,12 @@ static bool ux500_configure_channel(struct dma_channel *channel,
         slave_conf.dst_addr = usb_fifo_addr;
         slave_conf.dst_addr_width = addr_width;
         slave_conf.dst_maxburst = 16;
+        slave_conf.device_fc = false;
 
         dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
                                              (unsigned long) &slave_conf);
 
-        dma_desc = dma_chan->device->
-                        device_prep_slave_sg(dma_chan, &sg, 1, direction,
+        dma_desc = dmaengine_prep_slave_sg(dma_chan, &sg, 1, direction,
                                              DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!dma_desc)
                 return false;
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 3648c82a17fe..6ec7f838d7fa 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -786,9 +786,8 @@ static void xfer_work(struct work_struct *work)
         sg_dma_address(&sg) = pkt->dma + pkt->actual;
         sg_dma_len(&sg) = pkt->trans;
 
-        desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir,
-                                                  DMA_PREP_INTERRUPT |
-                                                  DMA_CTRL_ACK);
+        desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir,
+                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc)
                 return;
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 7c229d304684..ff8605b4b4be 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1724,7 +1724,8 @@ static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv)
 
 /*
  * Module parameter to control latency timer for NDI FTDI-based USB devices.
- * If this value is not set in modprobe.conf.local its value will be set to 1ms.
+ * If this value is not set in /etc/modprobe.d/ its value will be set
+ * to 1ms.
  */
 static int ndi_latency_timer = 1;
 
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index fe2d803a6347..7691c866637b 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -222,7 +222,7 @@ config USB_LIBUSUAL
           for usb-storage and ub drivers, and allows to switch binding
           of these devices without rebuilding modules.
 
-          Typical syntax of /etc/modprobe.conf is:
+          Typical syntax of /etc/modprobe.d/*conf is:
 
                 options libusual bias="ub"