USB: rename usb_buffer_alloc() and usb_buffer_free() users

[linux-block.git] / drivers / media / video / tlg2300 / pd-video.c

diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c
index becfba6a304173d7b89dc1a1033d6f026d8bd12a..7bc29065e1ad81d0933986961ab2606a6f5eeeab 100644 (file)
--- a/drivers/media/video/tlg2300/pd-video.c
+++ b/drivers/media/video/tlg2300/pd-video.c
@@ -4,6 +4,7 @@
 #include <linux/usb.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-dev.h>
@@ -475,10 +476,10 @@ static int prepare_iso_urb(struct video_data *video)
                        goto out;
 
                video->urb_array[i] = urb;
-               mem = usb_buffer_alloc(udev,
-                                       ISO_PKT_SIZE * PK_PER_URB,
-                                       GFP_KERNEL,
-                                       &urb->transfer_dma);
+               mem = usb_alloc_coherent(udev,
+                                        ISO_PKT_SIZE * PK_PER_URB,
+                                        GFP_KERNEL,
+                                        &urb->transfer_dma);
 
                urb->complete   = urb_complete_iso;     /* handler */
                urb->dev        = udev;
@@ -518,8 +519,8 @@ int alloc_bulk_urbs_generic(struct urb **urb_array, int num,
                if (urb == NULL)
                        return i;
 
-               mem = usb_buffer_alloc(udev, buf_size, gfp_flags,
-                                       &urb->transfer_dma);
+               mem = usb_alloc_coherent(udev, buf_size, gfp_flags,
+                                        &urb->transfer_dma);
                if (mem == NULL)
                        return i;
 
@@ -539,7 +540,7 @@ void free_all_urb_generic(struct urb **urb_array, int num)
        for (i = 0; i < num; i++) {
                urb = urb_array[i];
                if (urb) {
-                       usb_buffer_free(urb->dev,
+                       usb_free_coherent(urb->dev,
                                        urb->transfer_buffer_length,
                                        urb->transfer_buffer,
                                        urb->transfer_dma);