UBUNTU: SAUCE: ndiswrapper: rename usb_buffer_alloc() and usb_buffer_free()
authorLeann Ogasawara <leann.ogasawara@canonical.com>
Thu, 3 Jun 2010 03:42:24 +0000 (20:42 -0700)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 28 Mar 2011 13:48:43 +0000 (06:48 -0700)
usb_buffer_alloc() is renamed to usb_alloc_coherent()
usb_buffer_free()  is renamed to usb_free_coherent()

This is due to the removal of the usb_buffer_alloc() and
usb_buffer_free() macros:

  commit e26bcf37234c67624f62d9fc95f922b8dbda1363
  Author: Greg Kroah-Hartman <gregkh@suse.de>
  Date:   Thu Apr 29 15:46:07 2010 -0700

    USB: remove unused usb_buffer_alloc and usb_buffer_free macros

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

ubuntu/ndiswrapper/usb.c

index f2ddfb4..0e6da84 100644 (file)
@@ -191,7 +191,7 @@ static void wrap_free_urb(struct urb *urb)
        if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
                USBTRACE("freeing DMA buffer for URB: %p %p",
                         urb, urb->transfer_buffer);
-               usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev,
+               usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
                                urb->transfer_buffer_length,
                                urb->transfer_buffer, urb->transfer_dma);
        }
@@ -304,7 +304,7 @@ static struct urb *wrap_alloc_urb(struct irp *irp, unsigned int pipe,
 #endif
                    )) {
                urb->transfer_buffer =
-                       usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
+                       usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
                                         &urb->transfer_dma);
                if (!urb->transfer_buffer) {
                        WARNING("couldn't allocate dma buf");