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

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 222af479150b..00713f81d1e2 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -213,7 +213,7 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,
                 goto error;
         }
 
-        buffer = usb_buffer_alloc(dev, ep->wMaxPacketSize,
+        buffer = usb_alloc_coherent(dev, ep->wMaxPacketSize,
                                 GFP_KERNEL, &urb->transfer_dma);
         if (!buffer) {
                 ret = -ENOMEM;
@@ -232,10 +232,10 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,
         return ret;
 
 error_submit:
-        usb_buffer_free(dev,
-                        urb->transfer_buffer_length,
-                        urb->transfer_buffer,
-                        urb->transfer_dma);
+        usb_free_coherent(dev,
+                          urb->transfer_buffer_length,
+                          urb->transfer_buffer,
+                          urb->transfer_dma);
 error_buffer:
         usb_free_urb(urb);
 error:
@@ -272,10 +272,10 @@ static void gspca_input_destroy_urb(struct gspca_dev *gspca_dev)
         if (urb) {
                 gspca_dev->int_urb = NULL;
                 usb_kill_urb(urb);
-                usb_buffer_free(gspca_dev->dev,
-                                urb->transfer_buffer_length,
-                                urb->transfer_buffer,
-                                urb->transfer_dma);
+                usb_free_coherent(gspca_dev->dev,
+                                  urb->transfer_buffer_length,
+                                  urb->transfer_buffer,
+                                  urb->transfer_dma);
                 usb_free_urb(urb);
         }
 }
@@ -597,10 +597,10 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
                 gspca_dev->urb[i] = NULL;
                 usb_kill_urb(urb);
                 if (urb->transfer_buffer != NULL)
-                        usb_buffer_free(gspca_dev->dev,
-                                        urb->transfer_buffer_length,
-                                        urb->transfer_buffer,
-                                        urb->transfer_dma);
+                        usb_free_coherent(gspca_dev->dev,
+                                          urb->transfer_buffer_length,
+                                          urb->transfer_buffer,
+                                          urb->transfer_dma);
                 usb_free_urb(urb);
         }
 }
@@ -721,13 +721,13 @@ static int create_urbs(struct gspca_dev *gspca_dev,
                         return -ENOMEM;
                 }
                 gspca_dev->urb[n] = urb;
-                urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev,
+                urb->transfer_buffer = usb_alloc_coherent(gspca_dev->dev,
                                                 bsize,
                                                 GFP_KERNEL,
                                                 &urb->transfer_dma);
 
                 if (urb->transfer_buffer == NULL) {
-                        err("usb_buffer_alloc failed");
+                        err("usb_alloc_coherent failed");
                         return -ENOMEM;
                 }
                 urb->dev = gspca_dev->dev;