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>

3 files changed, 24 insertions, 24 deletions

diff --git a/sound/usb/ua101.c b/sound/usb/ua101.c
index 3d458d3b9962..d700e32dee24 100644
--- a/sound/usb/ua101.c
+++ b/sound/usb/ua101.c
@@ -41,7 +41,7 @@ MODULE_SUPPORTED_DEVICE("{{Edirol,UA-101},{Edirol,UA-1000}}");
 /*
  * This magic value optimizes memory usage efficiency for the UA-101's packet
  * sizes at all sample rates, taking into account the stupid cache pool sizes
- * that usb_buffer_alloc() uses.
+ * that usb_alloc_coherent() uses.
  */
 #define DEFAULT_QUEUE_LENGTH    21
 
@@ -1056,7 +1056,7 @@ static int alloc_stream_buffers(struct ua101 *ua, struct ua101_stream *stream)
                                    (unsigned int)MAX_QUEUE_LENGTH);
 
         /*
-         * The cache pool sizes used by usb_buffer_alloc() (128, 512, 2048) are
+         * The cache pool sizes used by usb_alloc_coherent() (128, 512, 2048) are
          * quite bad when used with the packet sizes of this device (e.g. 280,
          * 520, 624).  Therefore, we allocate and subdivide entire pages, using
          * a smaller buffer only for the last chunk.
@@ -1067,8 +1067,8 @@ static int alloc_stream_buffers(struct ua101 *ua, struct ua101_stream *stream)
                 packets = min(remaining_packets, packets_per_page);
                 size = packets * stream->max_packet_bytes;
                 stream->buffers[i].addr =
-                        usb_buffer_alloc(ua->dev, size, GFP_KERNEL,
-                                         &stream->buffers[i].dma);
+                        usb_alloc_coherent(ua->dev, size, GFP_KERNEL,
+                                           &stream->buffers[i].dma);
                 if (!stream->buffers[i].addr)
                         return -ENOMEM;
                 stream->buffers[i].size = size;
@@ -1088,10 +1088,10 @@ static void free_stream_buffers(struct ua101 *ua, struct ua101_stream *stream)
         unsigned int i;
 
         for (i = 0; i < ARRAY_SIZE(stream->buffers); ++i)
-                usb_buffer_free(ua->dev,
-                                stream->buffers[i].size,
-                                stream->buffers[i].addr,
-                                stream->buffers[i].dma);
+                usb_free_coherent(ua->dev,
+                                  stream->buffers[i].size,
+                                  stream->buffers[i].addr,
+                                  stream->buffers[i].dma);
 }
 
 static int alloc_stream_urbs(struct ua101 *ua, struct ua101_stream *stream,
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 11b0826b8fe6..9d2274ce01d5 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -985,9 +985,9 @@ static void release_urb_ctx(struct snd_urb_ctx *u)
 {
         if (u->urb) {
                 if (u->buffer_size)
-                        usb_buffer_free(u->subs->dev, u->buffer_size,
-                                        u->urb->transfer_buffer,
-                                        u->urb->transfer_dma);
+                        usb_free_coherent(u->subs->dev, u->buffer_size,
+                                          u->urb->transfer_buffer,
+                                          u->urb->transfer_dma);
                 usb_free_urb(u->urb);
                 u->urb = NULL;
         }
@@ -1008,8 +1008,8 @@ static void release_substream_urbs(struct snd_usb_substream *subs, int force)
                 release_urb_ctx(&subs->dataurb[i]);
         for (i = 0; i < SYNC_URBS; i++)
                 release_urb_ctx(&subs->syncurb[i]);
-        usb_buffer_free(subs->dev, SYNC_URBS * 4,
-                        subs->syncbuf, subs->sync_dma);
+        usb_free_coherent(subs->dev, SYNC_URBS * 4,
+                          subs->syncbuf, subs->sync_dma);
         subs->syncbuf = NULL;
         subs->nurbs = 0;
 }
@@ -1113,8 +1113,8 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
                 if (!u->urb)
                         goto out_of_memory;
                 u->urb->transfer_buffer =
-                        usb_buffer_alloc(subs->dev, u->buffer_size, GFP_KERNEL,
-                                         &u->urb->transfer_dma);
+                        usb_alloc_coherent(subs->dev, u->buffer_size, GFP_KERNEL,
+                                           &u->urb->transfer_dma);
                 if (!u->urb->transfer_buffer)
                         goto out_of_memory;
                 u->urb->pipe = subs->datapipe;
@@ -1126,8 +1126,8 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
 
         if (subs->syncpipe) {
                 /* allocate and initialize sync urbs */
-                subs->syncbuf = usb_buffer_alloc(subs->dev, SYNC_URBS * 4,
-                                                 GFP_KERNEL, &subs->sync_dma);
+                subs->syncbuf = usb_alloc_coherent(subs->dev, SYNC_URBS * 4,
+                                                   GFP_KERNEL, &subs->sync_dma);
                 if (!subs->syncbuf)
                         goto out_of_memory;
                 for (i = 0; i < SYNC_URBS; i++) {
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 9e28b20cb2ce..61b2d8fd0331 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1047,8 +1047,8 @@ static struct snd_rawmidi_ops snd_usbmidi_input_ops = {
 static void free_urb_and_buffer(struct snd_usb_midi *umidi, struct urb *urb,
                                 unsigned int buffer_length)
 {
-        usb_buffer_free(umidi->dev, buffer_length,
-                        urb->transfer_buffer, urb->transfer_dma);
+        usb_free_coherent(umidi->dev, buffer_length,
+                          urb->transfer_buffer, urb->transfer_dma);
         usb_free_urb(urb);
 }
 
@@ -1099,8 +1099,8 @@ static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi* umidi,
                 pipe = usb_rcvbulkpipe(umidi->dev, ep_info->in_ep);
         length = usb_maxpacket(umidi->dev, pipe, 0);
         for (i = 0; i < INPUT_URBS; ++i) {
-                buffer = usb_buffer_alloc(umidi->dev, length, GFP_KERNEL,
-                                          &ep->urbs[i]->transfer_dma);
+                buffer = usb_alloc_coherent(umidi->dev, length, GFP_KERNEL,
+                                            &ep->urbs[i]->transfer_dma);
                 if (!buffer) {
                         snd_usbmidi_in_endpoint_delete(ep);
                         return -ENOMEM;
@@ -1190,9 +1190,9 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
                 break;
         }
         for (i = 0; i < OUTPUT_URBS; ++i) {
-                buffer = usb_buffer_alloc(umidi->dev,
-                                          ep->max_transfer, GFP_KERNEL,
-                                          &ep->urbs[i].urb->transfer_dma);
+                buffer = usb_alloc_coherent(umidi->dev,
+                                            ep->max_transfer, GFP_KERNEL,
+                                            &ep->urbs[i].urb->transfer_dma);
                 if (!buffer) {
                         snd_usbmidi_out_endpoint_delete(ep);
                         return -ENOMEM;