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

Commit c8cf203a authored by Robert Morell's avatar Robert Morell Committed by Greg Kroah-Hartman
Browse files

USB: HCD: Add usb_hcd prefix to exported functions 



The convention is to prefix symbols exported from the USB HCD core with
"usb_hcd".  This change makes unmap_urb_setup_for_dma() and
unmap_urb_for_dma() consistent with that.

Signed-off-by: default avatarRobert Morell <rmorell@nvidia.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d25bc4db

drivers/usb/core/hcd.c

+8 −8
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ static void hcd_free_coherent(struct usb_bus *bus, dma_addr_t *dma_handle, 
	*dma_handle = 0;

}



void unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb)

void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb)

{

	if (urb->transfer_flags & URB_SETUP_MAP_SINGLE)

		dma_unmap_single(hcd->self.controller,
@@ -1279,13 +1279,13 @@ void unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb) 
	/* Make it safe to call this routine more than once */

	urb->transfer_flags &= ~(URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL);

}

EXPORT_SYMBOL_GPL(unmap_urb_setup_for_dma);

EXPORT_SYMBOL_GPL(usb_hcd_unmap_urb_setup_for_dma);



void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)

void usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)

{

	enum dma_data_direction dir;



	unmap_urb_setup_for_dma(hcd, urb);

	usb_hcd_unmap_urb_setup_for_dma(hcd, urb);



	dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;

	if (urb->transfer_flags & URB_DMA_MAP_SG)
@@ -1314,7 +1314,7 @@ void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb) 
	urb->transfer_flags &= ~(URB_DMA_MAP_SG | URB_DMA_MAP_PAGE |

			URB_DMA_MAP_SINGLE | URB_MAP_LOCAL);

}

EXPORT_SYMBOL_GPL(unmap_urb_for_dma);

EXPORT_SYMBOL_GPL(usb_hcd_unmap_urb_for_dma);



static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,

			   gfp_t mem_flags)
@@ -1410,7 +1410,7 @@ static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, 
		}

		if (ret && (urb->transfer_flags & (URB_SETUP_MAP_SINGLE |

				URB_SETUP_MAP_LOCAL)))

			unmap_urb_for_dma(hcd, urb);

			usb_hcd_unmap_urb_for_dma(hcd, urb);

	}

	return ret;

}
@@ -1451,7 +1451,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) 
		if (likely(status == 0)) {

			status = hcd->driver->urb_enqueue(hcd, urb, mem_flags);

			if (unlikely(status))

				unmap_urb_for_dma(hcd, urb);

				usb_hcd_unmap_urb_for_dma(hcd, urb);

		}

	}
@@ -1557,7 +1557,7 @@ void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb, int status) 
			!status))

		status = -EREMOTEIO;



	unmap_urb_for_dma(hcd, urb);

	usb_hcd_unmap_urb_for_dma(hcd, urb);

	usbmon_urb_complete(&hcd->self, urb, status);

	usb_unanchor_urb(urb);

drivers/usb/host/imx21-hcd.c

+3 −2
Original line number Diff line number Diff line
@@ -927,7 +927,8 @@ static void schedule_nonisoc_etd(struct imx21 *imx21, struct urb *urb) 
		if (state == US_CTRL_SETUP) {

			dir = TD_DIR_SETUP;

			if (unsuitable_for_dma(urb->setup_dma))

				unmap_urb_setup_for_dma(imx21->hcd, urb);

				usb_hcd_unmap_urb_setup_for_dma(imx21->hcd,

					urb);

			etd->dma_handle = urb->setup_dma;

			etd->cpu_buffer = urb->setup_packet;

			bufround = 0;
@@ -943,7 +944,7 @@ static void schedule_nonisoc_etd(struct imx21 *imx21, struct urb *urb) 
		dir = usb_pipeout(pipe) ? TD_DIR_OUT : TD_DIR_IN;

		bufround = (dir == TD_DIR_IN) ? 1 : 0;

		if (unsuitable_for_dma(urb->transfer_dma))

			unmap_urb_for_dma(imx21->hcd, urb);

			usb_hcd_unmap_urb_for_dma(imx21->hcd, urb);



		etd->dma_handle = urb->transfer_dma;

		etd->cpu_buffer = urb->transfer_buffer;

drivers/usb/musb/musb_host.c

+2 −2
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) 
	if (length > qh->maxpacket)

		length = qh->maxpacket;

	/* Unmap the buffer so that CPU can use it */

	unmap_urb_for_dma(musb_to_hcd(musb), urb);

	usb_hcd_unmap_urb_for_dma(musb_to_hcd(musb), urb);

	musb_write_fifo(hw_ep, length, urb->transfer_buffer + offset);

	qh->segsize = length;
@@ -1758,7 +1758,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) 


		if (!dma) {

			/* Unmap the buffer so that CPU can use it */

			unmap_urb_for_dma(musb_to_hcd(musb), urb);

			usb_hcd_unmap_urb_for_dma(musb_to_hcd(musb), urb);

			done = musb_host_packet_rx(musb, urb,

					epnum, iso_err);

			DBG(6, "read %spacket\n", done ? "last " : "");

include/linux/usb/hcd.h

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ extern int usb_hcd_submit_urb(struct urb *urb, gfp_t mem_flags); 
extern int usb_hcd_unlink_urb(struct urb *urb, int status);

extern void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb,

		int status);

extern void unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *);

extern void unmap_urb_for_dma(struct usb_hcd *, struct urb *);

extern void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *);

extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *);

extern void usb_hcd_flush_endpoint(struct usb_device *udev,

		struct usb_host_endpoint *ep);

extern void usb_hcd_disable_endpoint(struct usb_device *udev,