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/cx231xx | |
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/cx231xx')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index b24eee115e7e..6ccd87d5fb98 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/video/cx231xx/cx231xx-core.c | |||
@@ -679,11 +679,11 @@ void cx231xx_uninit_isoc(struct cx231xx *dev) | |||
679 | usb_unlink_urb(urb); | 679 | usb_unlink_urb(urb); |
680 | 680 | ||
681 | if (dev->video_mode.isoc_ctl.transfer_buffer[i]) { | 681 | if (dev->video_mode.isoc_ctl.transfer_buffer[i]) { |
682 | usb_buffer_free(dev->udev, | 682 | usb_free_coherent(dev->udev, |
683 | urb->transfer_buffer_length, | 683 | urb->transfer_buffer_length, |
684 | dev->video_mode.isoc_ctl. | 684 | dev->video_mode.isoc_ctl. |
685 | transfer_buffer[i], | 685 | transfer_buffer[i], |
686 | urb->transfer_dma); | 686 | urb->transfer_dma); |
687 | } | 687 | } |
688 | usb_free_urb(urb); | 688 | usb_free_urb(urb); |
689 | dev->video_mode.isoc_ctl.urb[i] = NULL; | 689 | dev->video_mode.isoc_ctl.urb[i] = NULL; |
@@ -770,8 +770,8 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, | |||
770 | dev->video_mode.isoc_ctl.urb[i] = urb; | 770 | dev->video_mode.isoc_ctl.urb[i] = urb; |
771 | 771 | ||
772 | dev->video_mode.isoc_ctl.transfer_buffer[i] = | 772 | dev->video_mode.isoc_ctl.transfer_buffer[i] = |
773 | usb_buffer_alloc(dev->udev, sb_size, GFP_KERNEL, | 773 | usb_alloc_coherent(dev->udev, sb_size, GFP_KERNEL, |
774 | &urb->transfer_dma); | 774 | &urb->transfer_dma); |
775 | if (!dev->video_mode.isoc_ctl.transfer_buffer[i]) { | 775 | if (!dev->video_mode.isoc_ctl.transfer_buffer[i]) { |
776 | cx231xx_err("unable to allocate %i bytes for transfer" | 776 | cx231xx_err("unable to allocate %i bytes for transfer" |
777 | " buffer %i%s\n", | 777 | " buffer %i%s\n", |