USB: remove uses of URB_NO_SETUP_DMA_MAP

This patch (as1350) removes all usages of coherent buffers for USB
control-request setup-packet buffers.  There's no good reason to
reserve coherent memory for these things; control requests are hardly
ever used in large quantity (the major exception is firmware
transfers, and they aren't time-critical).  Furthermore, only seven
drivers used it.  We might as well always use streaming DMA mappings
for setup-packet buffers, and remove some extra complexity from
usbcore.

The DMA-mapping portion of hcd.c is currently in flux.  A separate
patch will be submitted to remove support for URB_NO_SETUP_DMA_MAP
after everything else settles down.  The removal should go smoothly,
as by then nobody will be using it.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 86457feccfc4..8d2d291ee508 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,9 +628,7 @@ 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);
@@ -696,8 +693,7 @@ static int cm109_usb_probe(struct usb_interface *intf,
         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 */