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/usbvision | |
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/usbvision')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index f7aae2293758..b9dd74fde212 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c | |||
@@ -2493,10 +2493,10 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision) | |||
2493 | } | 2493 | } |
2494 | usbvision->sbuf[bufIdx].urb = urb; | 2494 | usbvision->sbuf[bufIdx].urb = urb; |
2495 | usbvision->sbuf[bufIdx].data = | 2495 | usbvision->sbuf[bufIdx].data = |
2496 | usb_buffer_alloc(usbvision->dev, | 2496 | usb_alloc_coherent(usbvision->dev, |
2497 | sb_size, | 2497 | sb_size, |
2498 | GFP_KERNEL, | 2498 | GFP_KERNEL, |
2499 | &urb->transfer_dma); | 2499 | &urb->transfer_dma); |
2500 | urb->dev = dev; | 2500 | urb->dev = dev; |
2501 | urb->context = usbvision; | 2501 | urb->context = usbvision; |
2502 | urb->pipe = usb_rcvisocpipe(dev, usbvision->video_endp); | 2502 | urb->pipe = usb_rcvisocpipe(dev, usbvision->video_endp); |
@@ -2552,10 +2552,10 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision) | |||
2552 | for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) { | 2552 | for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) { |
2553 | usb_kill_urb(usbvision->sbuf[bufIdx].urb); | 2553 | usb_kill_urb(usbvision->sbuf[bufIdx].urb); |
2554 | if (usbvision->sbuf[bufIdx].data){ | 2554 | if (usbvision->sbuf[bufIdx].data){ |
2555 | usb_buffer_free(usbvision->dev, | 2555 | usb_free_coherent(usbvision->dev, |
2556 | sb_size, | 2556 | sb_size, |
2557 | usbvision->sbuf[bufIdx].data, | 2557 | usbvision->sbuf[bufIdx].data, |
2558 | usbvision->sbuf[bufIdx].urb->transfer_dma); | 2558 | usbvision->sbuf[bufIdx].urb->transfer_dma); |
2559 | } | 2559 | } |
2560 | usb_free_urb(usbvision->sbuf[bufIdx].urb); | 2560 | usb_free_urb(usbvision->sbuf[bufIdx].urb); |
2561 | usbvision->sbuf[bufIdx].urb = NULL; | 2561 | usbvision->sbuf[bufIdx].urb = NULL; |