6 files changed, 37 insertions, 55 deletions

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 */