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>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 9b3353b404da..c1087ce4cef9 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -533,8 +533,8 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
         if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX)
                 return 0;
 
-        xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN,
-                                       GFP_KERNEL, &xpad->odata_dma);
+        xpad->odata = usb_alloc_coherent(xpad->udev, XPAD_PKT_LEN,
+                                         GFP_KERNEL, &xpad->odata_dma);
         if (!xpad->odata)
                 goto fail1;
 
@@ -554,7 +554,7 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
 
         return 0;
 
- fail2: usb_buffer_free(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma);
+ fail2: usb_free_coherent(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma);
  fail1: return error;
 }
 
@@ -568,7 +568,7 @@ static void xpad_deinit_output(struct usb_xpad *xpad)
 {
         if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) {
                 usb_free_urb(xpad->irq_out);
-                usb_buffer_free(xpad->udev, XPAD_PKT_LEN,
+                usb_free_coherent(xpad->udev, XPAD_PKT_LEN,
                                 xpad->odata, xpad->odata_dma);
         }
 }
@@ -788,8 +788,8 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         if (!xpad || !input_dev)
                 goto fail1;
 
-        xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN,
-                                       GFP_KERNEL, &xpad->idata_dma);
+        xpad->idata = usb_alloc_coherent(udev, XPAD_PKT_LEN,
+                                         GFP_KERNEL, &xpad->idata_dma);
         if (!xpad->idata)
                 goto fail1;
 
@@ -942,7 +942,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
  fail5: usb_kill_urb(xpad->irq_in);
  fail4: usb_free_urb(xpad->irq_in);
  fail3: xpad_deinit_output(xpad);
- fail2: usb_buffer_free(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
+ fail2: usb_free_coherent(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
  fail1: input_free_device(input_dev);
         kfree(xpad);
         return error;
@@ -964,7 +964,7 @@ static void xpad_disconnect(struct usb_interface *intf)
                         usb_kill_urb(xpad->irq_in);
                 }
                 usb_free_urb(xpad->irq_in);
-                usb_buffer_free(xpad->udev, XPAD_PKT_LEN,
+                usb_free_coherent(xpad->udev, XPAD_PKT_LEN,
                                 xpad->idata, xpad->idata_dma);
                 kfree(xpad);
         }