diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-05-27 21:10:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:44:46 -0400 |
commit | 9b8e7ba68ad0e4273f4897950de65bc311552cd1 (patch) | |
tree | b1f9d3ad7e174fa8b4eadd6ae5d6eb42bf9aed10 /drivers/usb | |
parent | b18ffd49e86102a9ed0a1cc83fdafe3891e844e5 (diff) |
USB: replace dma_sync_single and dma_sync_sg with dma_sync_single_for_cpu and dma_sync_sg_for_cpu
This replaces dma_sync_single() and dma_sync_sg() with
dma_sync_single_for_cpu() and dma_sync_sg_for_cpu() respectively
because they is an obsolete API; include/linux/dma-mapping.h says:
/* Backwards compat, remove in 2.7.x */
#define dma_sync_single dma_sync_single_for_cpu
#define dma_sync_sg dma_sync_sg_for_cpu
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/core/usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index c32811ae128f..020b58528d90 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -799,12 +799,12 @@ void usb_buffer_dmasync(struct urb *urb) | |||
799 | return; | 799 | return; |
800 | 800 | ||
801 | if (controller->dma_mask) { | 801 | if (controller->dma_mask) { |
802 | dma_sync_single(controller, | 802 | dma_sync_single_for_cpu(controller, |
803 | urb->transfer_dma, urb->transfer_buffer_length, | 803 | urb->transfer_dma, urb->transfer_buffer_length, |
804 | usb_pipein(urb->pipe) | 804 | usb_pipein(urb->pipe) |
805 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 805 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
806 | if (usb_pipecontrol(urb->pipe)) | 806 | if (usb_pipecontrol(urb->pipe)) |
807 | dma_sync_single(controller, | 807 | dma_sync_single_for_cpu(controller, |
808 | urb->setup_dma, | 808 | urb->setup_dma, |
809 | sizeof(struct usb_ctrlrequest), | 809 | sizeof(struct usb_ctrlrequest), |
810 | DMA_TO_DEVICE); | 810 | DMA_TO_DEVICE); |
@@ -922,8 +922,8 @@ void usb_buffer_dmasync_sg(const struct usb_device *dev, int is_in, | |||
922 | || !controller->dma_mask) | 922 | || !controller->dma_mask) |
923 | return; | 923 | return; |
924 | 924 | ||
925 | dma_sync_sg(controller, sg, n_hw_ents, | 925 | dma_sync_sg_for_cpu(controller, sg, n_hw_ents, |
926 | is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 926 | is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
927 | } | 927 | } |
928 | EXPORT_SYMBOL_GPL(usb_buffer_dmasync_sg); | 928 | EXPORT_SYMBOL_GPL(usb_buffer_dmasync_sg); |
929 | #endif | 929 | #endif |