diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-04-12 07:17:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:38 -0400 |
commit | 997ea58eb92f9970b8af7aae48800d0ef43b9423 (patch) | |
tree | 65e021973e5a48ad7290d5be1f441940566468ad /drivers/media/video/hdpvr/hdpvr-video.c | |
parent | 48679c6d772b1459a2945729e3a1256ac78fcabf (diff) |
USB: rename usb_buffer_alloc() and usb_buffer_free() users
For more clearance what the functions actually do,
usb_buffer_alloc() is renamed to usb_alloc_coherent()
usb_buffer_free() is renamed to usb_free_coherent()
They should only be used in code which really needs DMA coherency.
All call sites have been changed accordingly, except for staging
drivers.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Pedro Ribeiro <pedrib@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video/hdpvr/hdpvr-video.c')
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr-video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index 196f82de48f0..b65efe25b31d 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c | |||
@@ -92,8 +92,8 @@ static int hdpvr_free_queue(struct list_head *q) | |||
92 | buf = list_entry(p, struct hdpvr_buffer, buff_list); | 92 | buf = list_entry(p, struct hdpvr_buffer, buff_list); |
93 | 93 | ||
94 | urb = buf->urb; | 94 | urb = buf->urb; |
95 | usb_buffer_free(urb->dev, urb->transfer_buffer_length, | 95 | usb_free_coherent(urb->dev, urb->transfer_buffer_length, |
96 | urb->transfer_buffer, urb->transfer_dma); | 96 | urb->transfer_buffer, urb->transfer_dma); |
97 | usb_free_urb(urb); | 97 | usb_free_urb(urb); |
98 | tmp = p->next; | 98 | tmp = p->next; |
99 | list_del(p); | 99 | list_del(p); |
@@ -143,8 +143,8 @@ int hdpvr_alloc_buffers(struct hdpvr_device *dev, uint count) | |||
143 | } | 143 | } |
144 | buf->urb = urb; | 144 | buf->urb = urb; |
145 | 145 | ||
146 | mem = usb_buffer_alloc(dev->udev, dev->bulk_in_size, GFP_KERNEL, | 146 | mem = usb_alloc_coherent(dev->udev, dev->bulk_in_size, GFP_KERNEL, |
147 | &urb->transfer_dma); | 147 | &urb->transfer_dma); |
148 | if (!mem) { | 148 | if (!mem) { |
149 | v4l2_err(&dev->v4l2_dev, | 149 | v4l2_err(&dev->v4l2_dev, |
150 | "cannot allocate usb transfer buffer\n"); | 150 | "cannot allocate usb transfer buffer\n"); |