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, 18 insertions, 18 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);
         }
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index b89879bd860f..6dedded27222 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -715,15 +715,15 @@ static int bcm5974_probe(struct usb_interface *iface,
         if (!dev->tp_urb)
                 goto err_free_bt_urb;
 
-        dev->bt_data = usb_buffer_alloc(dev->udev,
-                                        dev->cfg.bt_datalen, GFP_KERNEL,
-                                        &dev->bt_urb->transfer_dma);
+        dev->bt_data = usb_alloc_coherent(dev->udev,
+                                          dev->cfg.bt_datalen, GFP_KERNEL,
+                                          &dev->bt_urb->transfer_dma);
         if (!dev->bt_data)
                 goto err_free_urb;
 
-        dev->tp_data = usb_buffer_alloc(dev->udev,
-                                        dev->cfg.tp_datalen, GFP_KERNEL,
-                                        &dev->tp_urb->transfer_dma);
+        dev->tp_data = usb_alloc_coherent(dev->udev,
+                                          dev->cfg.tp_datalen, GFP_KERNEL,
+                                          &dev->tp_urb->transfer_dma);
         if (!dev->tp_data)
                 goto err_free_bt_buffer;
 
@@ -765,10 +765,10 @@ static int bcm5974_probe(struct usb_interface *iface,
         return 0;
 
 err_free_buffer:
-        usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
+        usb_free_coherent(dev->udev, dev->cfg.tp_datalen,
                 dev->tp_data, dev->tp_urb->transfer_dma);
 err_free_bt_buffer:
-        usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
+        usb_free_coherent(dev->udev, dev->cfg.bt_datalen,
                 dev->bt_data, dev->bt_urb->transfer_dma);
 err_free_urb:
         usb_free_urb(dev->tp_urb);
@@ -788,10 +788,10 @@ static void bcm5974_disconnect(struct usb_interface *iface)
         usb_set_intfdata(iface, NULL);
 
         input_unregister_device(dev->input);
-        usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
-                        dev->tp_data, dev->tp_urb->transfer_dma);
-        usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
-                        dev->bt_data, dev->bt_urb->transfer_dma);
+        usb_free_coherent(dev->udev, dev->cfg.tp_datalen,
+                          dev->tp_data, dev->tp_urb->transfer_dma);
+        usb_free_coherent(dev->udev, dev->cfg.bt_datalen,
+                          dev->bt_data, dev->bt_urb->transfer_dma);
         usb_free_urb(dev->tp_urb);
         usb_free_urb(dev->bt_urb);
         kfree(dev);