Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c

2 files changed, 15 insertions, 15 deletions

diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 2c1558c327bb..8b1e4b124a9f 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1048,8 +1048,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);
 }
 
@@ -1100,8 +1100,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;
@@ -1191,9 +1191,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;
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 796d8b25ee89..fb5d68fa7ff4 100644
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -42,7 +42,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
 
@@ -1057,7 +1057,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.
@@ -1068,8 +1068,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;
@@ -1089,10 +1089,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,