USB: rename usb_buffer_alloc() and usb_buffer_free() users

For more clearance what the functions actually do,

  usb_buffer_alloc() is renamed to usb_alloc_coherent()
  usb_buffer_free()  is renamed to usb_free_coherent()

They should only be used in code which really needs DMA coherency.

All call sites have been changed accordingly, except for staging
drivers.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Pedro Ribeiro <pedrib@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 16 insertions, 20 deletions

diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 418825d26f90..197c352c47fb 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -128,17 +128,13 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone)
         if (rx_urb == NULL)
                 goto free_tx_urb;
 
-        tx_buf = usb_buffer_alloc(iphone->udev,
-                                  IPHETH_BUF_SIZE,
-                                  GFP_KERNEL,
-                                  &tx_urb->transfer_dma);
+        tx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
+                                    GFP_KERNEL, &tx_urb->transfer_dma);
         if (tx_buf == NULL)
                 goto free_rx_urb;
 
-        rx_buf = usb_buffer_alloc(iphone->udev,
-                                  IPHETH_BUF_SIZE,
-                                  GFP_KERNEL,
-                                  &rx_urb->transfer_dma);
+        rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
+                                    GFP_KERNEL, &rx_urb->transfer_dma);
         if (rx_buf == NULL)
                 goto free_tx_buf;
 
@@ -150,8 +146,8 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone)
         return 0;
 
 free_tx_buf:
-        usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
-                        tx_urb->transfer_dma);
+        usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
+                          tx_urb->transfer_dma);
 free_rx_urb:
         usb_free_urb(rx_urb);
 free_tx_urb:
@@ -162,10 +158,10 @@ error_nomem:
 
 static void ipheth_free_urbs(struct ipheth_device *iphone)
 {
-        usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
-                        iphone->rx_urb->transfer_dma);
-        usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
-                        iphone->tx_urb->transfer_dma);
+        usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
+                          iphone->rx_urb->transfer_dma);
+        usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
+                          iphone->tx_urb->transfer_dma);
         usb_free_urb(iphone->rx_urb);
         usb_free_urb(iphone->tx_urb);
 }
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index c4c334d9770f..a3eb7be51d53 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1156,13 +1156,13 @@ err_fw:
         if (!kaweth->irq_urb)
                 goto err_tx_and_rx;
 
-        kaweth->intbuffer = usb_buffer_alloc(   kaweth->dev,
+        kaweth->intbuffer = usb_alloc_coherent( kaweth->dev,
                                                 INTBUFFERSIZE,
                                                 GFP_KERNEL,
                                                 &kaweth->intbufferhandle);
         if (!kaweth->intbuffer)
                 goto err_tx_and_rx_and_irq;
-        kaweth->rx_buf = usb_buffer_alloc(      kaweth->dev,
+        kaweth->rx_buf = usb_alloc_coherent(    kaweth->dev,
                                                 KAWETH_BUF_SIZE,
                                                 GFP_KERNEL,
                                                 &kaweth->rxbufferhandle);
@@ -1203,9 +1203,9 @@ err_fw:
 
 err_intfdata:
         usb_set_intfdata(intf, NULL);
-        usb_buffer_free(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
+        usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
 err_all_but_rxbuf:
-        usb_buffer_free(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
+        usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
 err_tx_and_rx_and_irq:
         usb_free_urb(kaweth->irq_urb);
 err_tx_and_rx:
@@ -1242,8 +1242,8 @@ static void kaweth_disconnect(struct usb_interface *intf)
         usb_free_urb(kaweth->tx_urb);
         usb_free_urb(kaweth->irq_urb);
 
-        usb_buffer_free(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
-        usb_buffer_free(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
+        usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
+        usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
 
         free_netdev(netdev);
 }