USB: staging: fix up usb_buffer_alloc calls in the staging tree

This renames the functions usb_buffer_alloc and usb_buffer_free to the correct
ones for the drivers in the staging tree.

Cc: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/staging/rt2860/iface/rtmp_usb.h b/drivers/staging/rt2860/iface/rtmp_usb.h
index 6bb384a74660..33479cc443a5 100644
--- a/drivers/staging/rt2860/iface/rtmp_usb.h
+++ b/drivers/staging/rt2860/iface/rtmp_usb.h
@@ -81,8 +81,8 @@ extern u8 EpToQueue[6];
 #define RT28XX_PUT_DEVICE                                                       usb_put_dev
 #define RTUSB_ALLOC_URB(iso)                                                    usb_alloc_urb(iso, GFP_ATOMIC)
 #define RTUSB_SUBMIT_URB(pUrb)                                                  usb_submit_urb(pUrb, GFP_ATOMIC)
-#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr)                    usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
-#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)        usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
+#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr)                    usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
+#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)        usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
 
 #define RTUSB_FREE_URB(pUrb)    usb_free_urb(pUrb)
 
diff --git a/drivers/staging/udlfb/udlfb.c b/drivers/staging/udlfb/udlfb.c
index a78ade0dc687..aa8195199a2c 100644
--- a/drivers/staging/udlfb/udlfb.c
+++ b/drivers/staging/udlfb/udlfb.c
@@ -1508,8 +1508,8 @@ static void dlfb_free_urb_list(struct dlfb_data *dev)
                 urb = unode->urb;
 
                 /* Free each separately allocated piece */
-                usb_buffer_free(urb->dev, dev->urbs.size,
-                        urb->transfer_buffer, urb->transfer_dma);
+                usb_free_coherent(urb->dev, dev->urbs.size,
+                                  urb->transfer_buffer, urb->transfer_dma);
                 usb_free_urb(urb);
                 kfree(node);
         }
@@ -1543,8 +1543,8 @@ static int dlfb_alloc_urb_list(struct dlfb_data *dev, int count, size_t size)
                 }
                 unode->urb = urb;
 
-                buf = usb_buffer_alloc(dev->udev, MAX_TRANSFER, GFP_KERNEL,
-                                        &urb->transfer_dma);
+                buf = usb_alloc_coherent(dev->udev, MAX_TRANSFER, GFP_KERNEL,
+                                         &urb->transfer_dma);
                 if (!buf) {
                         kfree(unode);
                         usb_free_urb(urb);