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

15 files changed, 90 insertions, 108 deletions

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 9b3353b404da..c1087ce4cef9 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -533,8 +533,8 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
         if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX)
                 return 0;
 
-        xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN,
-                                       GFP_KERNEL, &xpad->odata_dma);
+        xpad->odata = usb_alloc_coherent(xpad->udev, XPAD_PKT_LEN,
+                                         GFP_KERNEL, &xpad->odata_dma);
         if (!xpad->odata)
                 goto fail1;
 
@@ -554,7 +554,7 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
 
         return 0;
 
- fail2: usb_buffer_free(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma);
+ fail2: usb_free_coherent(xpad->udev, XPAD_PKT_LEN, xpad->odata, xpad->odata_dma);
  fail1: return error;
 }
 
@@ -568,7 +568,7 @@ static void xpad_deinit_output(struct usb_xpad *xpad)
 {
         if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) {
                 usb_free_urb(xpad->irq_out);
-                usb_buffer_free(xpad->udev, XPAD_PKT_LEN,
+                usb_free_coherent(xpad->udev, XPAD_PKT_LEN,
                                 xpad->odata, xpad->odata_dma);
         }
 }
@@ -788,8 +788,8 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         if (!xpad || !input_dev)
                 goto fail1;
 
-        xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN,
-                                       GFP_KERNEL, &xpad->idata_dma);
+        xpad->idata = usb_alloc_coherent(udev, XPAD_PKT_LEN,
+                                         GFP_KERNEL, &xpad->idata_dma);
         if (!xpad->idata)
                 goto fail1;
 
@@ -942,7 +942,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
  fail5: usb_kill_urb(xpad->irq_in);
  fail4: usb_free_urb(xpad->irq_in);
  fail3: xpad_deinit_output(xpad);
- fail2: usb_buffer_free(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
+ fail2: usb_free_coherent(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
  fail1: input_free_device(input_dev);
         kfree(xpad);
         return error;
@@ -964,7 +964,7 @@ static void xpad_disconnect(struct usb_interface *intf)
                         usb_kill_urb(xpad->irq_in);
                 }
                 usb_free_urb(xpad->irq_in);
-                usb_buffer_free(xpad->udev, XPAD_PKT_LEN,
+                usb_free_coherent(xpad->udev, XPAD_PKT_LEN,
                                 xpad->idata, xpad->idata_dma);
                 kfree(xpad);
         }
diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c
index e8bbc619f6df..bce57129afba 100644
--- a/drivers/input/misc/ati_remote.c
+++ b/drivers/input/misc/ati_remote.c
@@ -624,13 +624,13 @@ static void ati_remote_irq_in(struct urb *urb)
 static int ati_remote_alloc_buffers(struct usb_device *udev,
                                     struct ati_remote *ati_remote)
 {
-        ati_remote->inbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, GFP_ATOMIC,
-                                             &ati_remote->inbuf_dma);
+        ati_remote->inbuf = usb_alloc_coherent(udev, DATA_BUFSIZE, GFP_ATOMIC,
+                                               &ati_remote->inbuf_dma);
         if (!ati_remote->inbuf)
                 return -1;
 
-        ati_remote->outbuf = usb_buffer_alloc(udev, DATA_BUFSIZE, GFP_ATOMIC,
-                                              &ati_remote->outbuf_dma);
+        ati_remote->outbuf = usb_alloc_coherent(udev, DATA_BUFSIZE, GFP_ATOMIC,
+                                                &ati_remote->outbuf_dma);
         if (!ati_remote->outbuf)
                 return -1;
 
@@ -653,10 +653,10 @@ static void ati_remote_free_buffers(struct ati_remote *ati_remote)
         usb_free_urb(ati_remote->irq_urb);
         usb_free_urb(ati_remote->out_urb);
 
-        usb_buffer_free(ati_remote->udev, DATA_BUFSIZE,
+        usb_free_coherent(ati_remote->udev, DATA_BUFSIZE,
                 ati_remote->inbuf, ati_remote->inbuf_dma);
 
-        usb_buffer_free(ati_remote->udev, DATA_BUFSIZE,
+        usb_free_coherent(ati_remote->udev, DATA_BUFSIZE,
                 ati_remote->outbuf, ati_remote->outbuf_dma);
 }
 
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index 2124b99378bb..e148749b5851 100644
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -589,7 +589,7 @@ static int ati_remote2_urb_init(struct ati_remote2 *ar2)
         int i, pipe, maxp;
 
         for (i = 0; i < 2; i++) {
-                ar2->buf[i] = usb_buffer_alloc(udev, 4, GFP_KERNEL, &ar2->buf_dma[i]);
+                ar2->buf[i] = usb_alloc_coherent(udev, 4, GFP_KERNEL, &ar2->buf_dma[i]);
                 if (!ar2->buf[i])
                         return -ENOMEM;
 
@@ -617,7 +617,7 @@ static void ati_remote2_urb_cleanup(struct ati_remote2 *ar2)
 
         for (i = 0; i < 2; i++) {
                 usb_free_urb(ar2->urb[i]);
-                usb_buffer_free(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]);
+                usb_free_coherent(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]);
         }
 }
 
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 86457feccfc4..2b0eba6619bd 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -102,7 +102,6 @@ struct cm109_dev {
         struct cm109_ctl_packet *ctl_data;
         dma_addr_t ctl_dma;
         struct usb_ctrlrequest *ctl_req;
-        dma_addr_t ctl_req_dma;
         struct urb *urb_ctl;
         /*
          * The 3 bitfields below are protected by ctl_submit_lock.
@@ -629,15 +628,13 @@ static const struct usb_device_id cm109_usb_table[] = {
 
 static void cm109_usb_cleanup(struct cm109_dev *dev)
 {
-        if (dev->ctl_req)
-                usb_buffer_free(dev->udev, sizeof(*(dev->ctl_req)),
-                                dev->ctl_req, dev->ctl_req_dma);
+        kfree(dev->ctl_req);
         if (dev->ctl_data)
-                usb_buffer_free(dev->udev, USB_PKT_LEN,
-                                dev->ctl_data, dev->ctl_dma);
+                usb_free_coherent(dev->udev, USB_PKT_LEN,
+                                  dev->ctl_data, dev->ctl_dma);
         if (dev->irq_data)
-                usb_buffer_free(dev->udev, USB_PKT_LEN,
-                                dev->irq_data, dev->irq_dma);
+                usb_free_coherent(dev->udev, USB_PKT_LEN,
+                                  dev->irq_data, dev->irq_dma);
 
         usb_free_urb(dev->urb_irq);     /* parameter validation in core/urb */
         usb_free_urb(dev->urb_ctl);     /* parameter validation in core/urb */
@@ -686,18 +683,17 @@ static int cm109_usb_probe(struct usb_interface *intf,
                 goto err_out;
 
         /* allocate usb buffers */
-        dev->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN,
-                                         GFP_KERNEL, &dev->irq_dma);
+        dev->irq_data = usb_alloc_coherent(udev, USB_PKT_LEN,
+                                           GFP_KERNEL, &dev->irq_dma);
         if (!dev->irq_data)
                 goto err_out;
 
-        dev->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN,
-                                         GFP_KERNEL, &dev->ctl_dma);
+        dev->ctl_data = usb_alloc_coherent(udev, USB_PKT_LEN,
+                                           GFP_KERNEL, &dev->ctl_dma);
         if (!dev->ctl_data)
                 goto err_out;
 
-        dev->ctl_req = usb_buffer_alloc(udev, sizeof(*(dev->ctl_req)),
-                                        GFP_KERNEL, &dev->ctl_req_dma);
+        dev->ctl_req = kmalloc(sizeof(*(dev->ctl_req)), GFP_KERNEL);
         if (!dev->ctl_req)
                 goto err_out;
 
@@ -735,10 +731,8 @@ static int cm109_usb_probe(struct usb_interface *intf,
         usb_fill_control_urb(dev->urb_ctl, udev, usb_sndctrlpipe(udev, 0),
                              (void *)dev->ctl_req, dev->ctl_data, USB_PKT_LEN,
                              cm109_urb_ctl_callback, dev);
-        dev->urb_ctl->setup_dma = dev->ctl_req_dma;
         dev->urb_ctl->transfer_dma = dev->ctl_dma;
-        dev->urb_ctl->transfer_flags |= URB_NO_SETUP_DMA_MAP |
-                                        URB_NO_TRANSFER_DMA_MAP;
+        dev->urb_ctl->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
         dev->urb_ctl->dev = udev;
 
         /* find out the physical bus location */
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 86afdd1fdf9d..a93c525475c6 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -464,7 +464,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         remote->in_endpoint = endpoint;
         remote->toggle = -1;    /* Set to -1 so we will always not match the toggle from the first remote message. */
 
-        remote->in_buffer = usb_buffer_alloc(udev, RECV_SIZE, GFP_ATOMIC, &remote->in_dma);
+        remote->in_buffer = usb_alloc_coherent(udev, RECV_SIZE, GFP_ATOMIC, &remote->in_dma);
         if (!remote->in_buffer) {
                 error = -ENOMEM;
                 goto fail1;
@@ -543,7 +543,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         return 0;
 
  fail3: usb_free_urb(remote->irq_urb);
- fail2: usb_buffer_free(udev, RECV_SIZE, remote->in_buffer, remote->in_dma);
+ fail2: usb_free_coherent(udev, RECV_SIZE, remote->in_buffer, remote->in_dma);
  fail1: kfree(remote);
         input_free_device(input_dev);
 
@@ -564,7 +564,7 @@ static void keyspan_disconnect(struct usb_interface *interface)
                 input_unregister_device(remote->input);
                 usb_kill_urb(remote->irq_urb);
                 usb_free_urb(remote->irq_urb);
-                usb_buffer_free(remote->udev, RECV_SIZE, remote->in_buffer, remote->in_dma);
+                usb_free_coherent(remote->udev, RECV_SIZE, remote->in_buffer, remote->in_dma);
                 kfree(remote);
         }
 }
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index 668913d12044..bf170f6b4422 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -64,7 +64,6 @@ struct powermate_device {
         dma_addr_t data_dma;
         struct urb *irq, *config;
         struct usb_ctrlrequest *configcr;
-        dma_addr_t configcr_dma;
         struct usb_device *udev;
         struct input_dev *input;
         spinlock_t lock;
@@ -182,8 +181,6 @@ static void powermate_sync_state(struct powermate_device *pm)
         usb_fill_control_urb(pm->config, pm->udev, usb_sndctrlpipe(pm->udev, 0),
                              (void *) pm->configcr, NULL, 0,
                              powermate_config_complete, pm);
-        pm->config->setup_dma = pm->configcr_dma;
-        pm->config->transfer_flags |= URB_NO_SETUP_DMA_MAP;
 
         if (usb_submit_urb(pm->config, GFP_ATOMIC))
                 printk(KERN_ERR "powermate: usb_submit_urb(config) failed");
@@ -276,13 +273,12 @@ static int powermate_input_event(struct input_dev *dev, unsigned int type, unsig
 
 static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm)
 {
-        pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE_MAX,
-                                    GFP_ATOMIC, &pm->data_dma);
+        pm->data = usb_alloc_coherent(udev, POWERMATE_PAYLOAD_SIZE_MAX,
+                                      GFP_ATOMIC, &pm->data_dma);
         if (!pm->data)
                 return -1;
 
-        pm->configcr = usb_buffer_alloc(udev, sizeof(*(pm->configcr)),
-                                        GFP_ATOMIC, &pm->configcr_dma);
+        pm->configcr = kmalloc(sizeof(*(pm->configcr)), GFP_KERNEL);
         if (!pm->configcr)
                 return -1;
 
@@ -291,10 +287,9 @@ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_dev
 
 static void powermate_free_buffers(struct usb_device *udev, struct powermate_device *pm)
 {
-        usb_buffer_free(udev, POWERMATE_PAYLOAD_SIZE_MAX,
-                        pm->data, pm->data_dma);
-        usb_buffer_free(udev, sizeof(*(pm->configcr)),
-                        pm->configcr, pm->configcr_dma);
+        usb_free_coherent(udev, POWERMATE_PAYLOAD_SIZE_MAX,
+                          pm->data, pm->data_dma);
+        kfree(pm->configcr);
 }
 
 /* Called whenever a USB device matching one in our supported devices table is connected */
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 93a22ac0f88c..41201c6b5e68 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -111,7 +111,6 @@ struct yealink_dev {
         struct yld_ctl_packet   *ctl_data;
         dma_addr_t              ctl_dma;
         struct usb_ctrlrequest  *ctl_req;
-        dma_addr_t              ctl_req_dma;
         struct urb              *urb_ctl;
 
         char phys[64];                  /* physical device path */
@@ -836,12 +835,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
         usb_free_urb(yld->urb_irq);
         usb_free_urb(yld->urb_ctl);
 
-        usb_buffer_free(yld->udev, sizeof(*(yld->ctl_req)),
-                        yld->ctl_req, yld->ctl_req_dma);
-        usb_buffer_free(yld->udev, USB_PKT_LEN,
-                        yld->ctl_data, yld->ctl_dma);
-        usb_buffer_free(yld->udev, USB_PKT_LEN,
-                        yld->irq_data, yld->irq_dma);
+        kfree(yld->ctl_req);
+        usb_free_coherent(yld->udev, USB_PKT_LEN, yld->ctl_data, yld->ctl_dma);
+        usb_free_coherent(yld->udev, USB_PKT_LEN, yld->irq_data, yld->irq_dma);
 
         kfree(yld);
         return err;
@@ -886,18 +882,17 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 return usb_cleanup(yld, -ENOMEM);
 
         /* allocate usb buffers */
-        yld->irq_data = usb_buffer_alloc(udev, USB_PKT_LEN,
-                                        GFP_ATOMIC, &yld->irq_dma);
+        yld->irq_data = usb_alloc_coherent(udev, USB_PKT_LEN,
+                                           GFP_ATOMIC, &yld->irq_dma);
         if (yld->irq_data == NULL)
                 return usb_cleanup(yld, -ENOMEM);
 
-        yld->ctl_data = usb_buffer_alloc(udev, USB_PKT_LEN,
-                                        GFP_ATOMIC, &yld->ctl_dma);
+        yld->ctl_data = usb_alloc_coherent(udev, USB_PKT_LEN,
+                                           GFP_ATOMIC, &yld->ctl_dma);
         if (!yld->ctl_data)
                 return usb_cleanup(yld, -ENOMEM);
 
-        yld->ctl_req = usb_buffer_alloc(udev, sizeof(*(yld->ctl_req)),
-                                        GFP_ATOMIC, &yld->ctl_req_dma);
+        yld->ctl_req = kmalloc(sizeof(*(yld->ctl_req)), GFP_KERNEL);
         if (yld->ctl_req == NULL)
                 return usb_cleanup(yld, -ENOMEM);
 
@@ -936,10 +931,8 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         usb_fill_control_urb(yld->urb_ctl, udev, usb_sndctrlpipe(udev, 0),
                         (void *)yld->ctl_req, yld->ctl_data, USB_PKT_LEN,
                         urb_ctl_callback, yld);
-        yld->urb_ctl->setup_dma = yld->ctl_req_dma;
         yld->urb_ctl->transfer_dma      = yld->ctl_dma;
-        yld->urb_ctl->transfer_flags    |= URB_NO_SETUP_DMA_MAP |
-                                        URB_NO_TRANSFER_DMA_MAP;
+        yld->urb_ctl->transfer_flags    |= URB_NO_TRANSFER_DMA_MAP;
         yld->urb_ctl->dev = udev;
 
         /* find out the physical bus location */
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);
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index 37d0539fefa0..aea9a9399a36 100644
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -155,7 +155,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
                 goto fail1;
         }
 
-        acecad->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &acecad->data_dma);
+        acecad->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &acecad->data_dma);
         if (!acecad->data) {
                 err= -ENOMEM;
                 goto fail1;
@@ -235,7 +235,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
 
         return 0;
 
- fail2: usb_buffer_free(dev, 8, acecad->data, acecad->data_dma);
+ fail2: usb_free_coherent(dev, 8, acecad->data, acecad->data_dma);
  fail1: input_free_device(input_dev);
         kfree(acecad);
         return err;
@@ -249,7 +249,7 @@ static void usb_acecad_disconnect(struct usb_interface *intf)
 
         input_unregister_device(acecad->input);
         usb_free_urb(acecad->irq);
-        usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma);
+        usb_free_coherent(acecad->usbdev, 8, acecad->data, acecad->data_dma);
         kfree(acecad);
 }
 
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 4be039d7dcad..51b80b08d467 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1711,8 +1711,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto fail1;
         }
 
-        aiptek->data = usb_buffer_alloc(usbdev, AIPTEK_PACKET_LENGTH,
-                                        GFP_ATOMIC, &aiptek->data_dma);
+        aiptek->data = usb_alloc_coherent(usbdev, AIPTEK_PACKET_LENGTH,
+                                          GFP_ATOMIC, &aiptek->data_dma);
         if (!aiptek->data) {
                 dev_warn(&intf->dev, "cannot allocate usb buffer\n");
                 goto fail1;
@@ -1884,8 +1884,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
  fail4: sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group);
  fail3: usb_free_urb(aiptek->urb);
- fail2: usb_buffer_free(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data,
-                        aiptek->data_dma);
+ fail2: usb_free_coherent(usbdev, AIPTEK_PACKET_LENGTH, aiptek->data,
+                          aiptek->data_dma);
  fail1: usb_set_intfdata(intf, NULL);
         input_free_device(inputdev);
         kfree(aiptek);
@@ -1909,9 +1909,9 @@ static void aiptek_disconnect(struct usb_interface *intf)
                 input_unregister_device(aiptek->inputdev);
                 sysfs_remove_group(&intf->dev.kobj, &aiptek_attribute_group);
                 usb_free_urb(aiptek->urb);
-                usb_buffer_free(interface_to_usbdev(intf),
-                                AIPTEK_PACKET_LENGTH,
-                                aiptek->data, aiptek->data_dma);
+                usb_free_coherent(interface_to_usbdev(intf),
+                                  AIPTEK_PACKET_LENGTH,
+                                  aiptek->data, aiptek->data_dma);
                 kfree(aiptek);
         }
 }
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index 866a9ee1af1a..8ea6afe2e992 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -850,8 +850,8 @@ static int gtco_probe(struct usb_interface *usbinterface,
         gtco->usbdev = usb_get_dev(interface_to_usbdev(usbinterface));
 
         /* Allocate some data for incoming reports */
-        gtco->buffer = usb_buffer_alloc(gtco->usbdev, REPORT_MAX_SIZE,
-                                        GFP_KERNEL, &gtco->buf_dma);
+        gtco->buffer = usb_alloc_coherent(gtco->usbdev, REPORT_MAX_SIZE,
+                                          GFP_KERNEL, &gtco->buf_dma);
         if (!gtco->buffer) {
                 err("No more memory for us buffers");
                 error = -ENOMEM;
@@ -982,8 +982,8 @@ static int gtco_probe(struct usb_interface *usbinterface,
  err_free_urb:
         usb_free_urb(gtco->urbinfo);
  err_free_buf:
-        usb_buffer_free(gtco->usbdev, REPORT_MAX_SIZE,
-                        gtco->buffer, gtco->buf_dma);
+        usb_free_coherent(gtco->usbdev, REPORT_MAX_SIZE,
+                          gtco->buffer, gtco->buf_dma);
  err_free_devs:
         input_free_device(input_dev);
         kfree(gtco);
@@ -1005,8 +1005,8 @@ static void gtco_disconnect(struct usb_interface *interface)
                 input_unregister_device(gtco->inputdevice);
                 usb_kill_urb(gtco->urbinfo);
                 usb_free_urb(gtco->urbinfo);
-                usb_buffer_free(gtco->usbdev, REPORT_MAX_SIZE,
-                                gtco->buffer, gtco->buf_dma);
+                usb_free_coherent(gtco->usbdev, REPORT_MAX_SIZE,
+                                  gtco->buffer, gtco->buf_dma);
                 kfree(gtco);
         }
 
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index b9969f120247..290f4e57b589 100644
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -122,7 +122,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         if (!kbtab || !input_dev)
                 goto fail1;
 
-        kbtab->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &kbtab->data_dma);
+        kbtab->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &kbtab->data_dma);
         if (!kbtab->data)
                 goto fail1;
 
@@ -173,7 +173,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         return 0;
 
  fail3: usb_free_urb(kbtab->irq);
- fail2: usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma);
+ fail2: usb_free_coherent(dev, 8, kbtab->data, kbtab->data_dma);
  fail1: input_free_device(input_dev);
         kfree(kbtab);
         return error;
@@ -187,7 +187,7 @@ static void kbtab_disconnect(struct usb_interface *intf)
 
         input_unregister_device(kbtab->dev);
         usb_free_urb(kbtab->irq);
-        usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
+        usb_free_coherent(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
         kfree(kbtab);
 }
 
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index d90f4e00e51d..2dc0c07c0469 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -465,8 +465,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
                 goto fail1;
         }
 
-        wacom_wac->data = usb_buffer_alloc(dev, WACOM_PKGLEN_MAX,
-                                           GFP_KERNEL, &wacom->data_dma);
+        wacom_wac->data = usb_alloc_coherent(dev, WACOM_PKGLEN_MAX,
+                                             GFP_KERNEL, &wacom->data_dma);
         if (!wacom_wac->data) {
                 error = -ENOMEM;
                 goto fail1;
@@ -536,7 +536,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
  fail4: wacom_remove_shared_data(wacom_wac);
  fail3: usb_free_urb(wacom->irq);
- fail2: usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
+ fail2: usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
  fail1: input_free_device(input_dev);
         kfree(wacom);
         return error;
@@ -551,7 +551,7 @@ static void wacom_disconnect(struct usb_interface *intf)
         usb_kill_urb(wacom->irq);
         input_unregister_device(wacom->wacom_wac.input);
         usb_free_urb(wacom->irq);
-        usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
+        usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
                         wacom->wacom_wac.data, wacom->data_dma);
         wacom_remove_shared_data(&wacom->wacom_wac);
         kfree(wacom);
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 0b0ae2e17a60..29a8bbf3f086 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -1290,8 +1290,8 @@ static void usbtouch_close(struct input_dev *input)
 static void usbtouch_free_buffers(struct usb_device *udev,
                                   struct usbtouch_usb *usbtouch)
 {
-        usb_buffer_free(udev, usbtouch->type->rept_size,
-                        usbtouch->data, usbtouch->data_dma);
+        usb_free_coherent(udev, usbtouch->type->rept_size,
+                          usbtouch->data, usbtouch->data_dma);
         kfree(usbtouch->buffer);
 }
 
@@ -1335,8 +1335,8 @@ static int usbtouch_probe(struct usb_interface *intf,
         if (!type->process_pkt)
                 type->process_pkt = usbtouch_process_pkt;
 
-        usbtouch->data = usb_buffer_alloc(udev, type->rept_size,
-                                          GFP_KERNEL, &usbtouch->data_dma);
+        usbtouch->data = usb_alloc_coherent(udev, type->rept_size,
+                                            GFP_KERNEL, &usbtouch->data_dma);
         if (!usbtouch->data)
                 goto out_free;