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

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 5e1a253b08a0..0c2f14ff9696 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -892,7 +892,7 @@ static void acm_write_buffers_free(struct acm *acm)
         struct usb_device *usb_dev = interface_to_usbdev(acm->control);
 
         for (wb = &acm->wb[0], i = 0; i < ACM_NW; i++, wb++)
-                usb_buffer_free(usb_dev, acm->writesize, wb->buf, wb->dmah);
+                usb_free_coherent(usb_dev, acm->writesize, wb->buf, wb->dmah);
 }
 
 static void acm_read_buffers_free(struct acm *acm)
@@ -901,8 +901,8 @@ static void acm_read_buffers_free(struct acm *acm)
         int i, n = acm->rx_buflimit;
 
         for (i = 0; i < n; i++)
-                usb_buffer_free(usb_dev, acm->readsize,
-                                        acm->rb[i].base, acm->rb[i].dma);
+                usb_free_coherent(usb_dev, acm->readsize,
+                                  acm->rb[i].base, acm->rb[i].dma);
 }
 
 /* Little helper: write buffers allocate */
@@ -912,13 +912,13 @@ static int acm_write_buffers_alloc(struct acm *acm)
         struct acm_wb *wb;
 
         for (wb = &acm->wb[0], i = 0; i < ACM_NW; i++, wb++) {
-                wb->buf = usb_buffer_alloc(acm->dev, acm->writesize, GFP_KERNEL,
+                wb->buf = usb_alloc_coherent(acm->dev, acm->writesize, GFP_KERNEL,
                     &wb->dmah);
                 if (!wb->buf) {
                         while (i != 0) {
                                 --i;
                                 --wb;
-                                usb_buffer_free(acm->dev, acm->writesize,
+                                usb_free_coherent(acm->dev, acm->writesize,
                                     wb->buf, wb->dmah);
                         }
                         return -ENOMEM;
@@ -1177,7 +1177,7 @@ made_compressed_probe:
         tty_port_init(&acm->port);
         acm->port.ops = &acm_port_ops;
 
-        buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
+        buf = usb_alloc_coherent(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
         if (!buf) {
                 dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n");
                 goto alloc_fail2;
@@ -1210,11 +1210,11 @@ made_compressed_probe:
         for (i = 0; i < num_rx_buf; i++) {
                 struct acm_rb *rb = &(acm->rb[i]);
 
-                rb->base = usb_buffer_alloc(acm->dev, readsize,
+                rb->base = usb_alloc_coherent(acm->dev, readsize,
                                 GFP_KERNEL, &rb->dma);
                 if (!rb->base) {
                         dev_dbg(&intf->dev,
-                                "out of memory (read bufs usb_buffer_alloc)\n");
+                                "out of memory (read bufs usb_alloc_coherent)\n");
                         goto alloc_fail7;
                 }
         }
@@ -1306,7 +1306,7 @@ alloc_fail7:
 alloc_fail5:
         acm_write_buffers_free(acm);
 alloc_fail4:
-        usb_buffer_free(usb_dev, ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
+        usb_free_coherent(usb_dev, ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
 alloc_fail2:
         kfree(acm);
 alloc_fail:
@@ -1356,8 +1356,8 @@ static void acm_disconnect(struct usb_interface *intf)
         stop_data_traffic(acm);
 
         acm_write_buffers_free(acm);
-        usb_buffer_free(usb_dev, acm->ctrlsize, acm->ctrl_buffer,
-                                                                acm->ctrl_dma);
+        usb_free_coherent(usb_dev, acm->ctrlsize, acm->ctrl_buffer,
+                          acm->ctrl_dma);
         acm_read_buffers_free(acm);
 
         if (!acm->combined_interfaces)