Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b8e7ba6 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Greg Kroah-Hartman
Browse files

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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b18ffd49

drivers/usb/core/usb.c

+4 −4
Original line number Diff line number Diff line
@@ -799,12 +799,12 @@ void usb_buffer_dmasync(struct urb *urb) 
		return;



	if (controller->dma_mask) {

		dma_sync_single(controller,

		dma_sync_single_for_cpu(controller,

			urb->transfer_dma, urb->transfer_buffer_length,

			usb_pipein(urb->pipe)

				? DMA_FROM_DEVICE : DMA_TO_DEVICE);

		if (usb_pipecontrol(urb->pipe))

			dma_sync_single(controller,

			dma_sync_single_for_cpu(controller,

					urb->setup_dma,

					sizeof(struct usb_ctrlrequest),

					DMA_TO_DEVICE);
@@ -922,7 +922,7 @@ void usb_buffer_dmasync_sg(const struct usb_device *dev, int is_in, 
			|| !controller->dma_mask)

		return;



	dma_sync_sg(controller, sg, n_hw_ents,

	dma_sync_sg_for_cpu(controller, sg, n_hw_ents,

			    is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE);

}

EXPORT_SYMBOL_GPL(usb_buffer_dmasync_sg);