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, 6 insertions, 6 deletions

diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index 53ec7ddd1826..05edd75abca0 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -806,8 +806,8 @@ static int atp_probe(struct usb_interface *iface,
         if (!dev->urb)
                 goto err_free_devs;
 
-        dev->data = usb_buffer_alloc(dev->udev, dev->info->datalen, GFP_KERNEL,
-                                     &dev->urb->transfer_dma);
+        dev->data = usb_alloc_coherent(dev->udev, dev->info->datalen, GFP_KERNEL,
+                                       &dev->urb->transfer_dma);
         if (!dev->data)
                 goto err_free_urb;
 
@@ -862,8 +862,8 @@ static int atp_probe(struct usb_interface *iface,
         return 0;
 
  err_free_buffer:
-        usb_buffer_free(dev->udev, dev->info->datalen,
-                        dev->data, dev->urb->transfer_dma);
+        usb_free_coherent(dev->udev, dev->info->datalen,
+                          dev->data, dev->urb->transfer_dma);
  err_free_urb:
         usb_free_urb(dev->urb);
  err_free_devs:
@@ -881,8 +881,8 @@ static void atp_disconnect(struct usb_interface *iface)
         if (dev) {
                 usb_kill_urb(dev->urb);
                 input_unregister_device(dev->input);
-                usb_buffer_free(dev->udev, dev->info->datalen,
-                                dev->data, dev->urb->transfer_dma);
+                usb_free_coherent(dev->udev, dev->info->datalen,
+                                  dev->data, dev->urb->transfer_dma);
                 usb_free_urb(dev->urb);
                 kfree(dev);
         }