redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

USB: HCD: Add usb_hcd prefix to exported functions

Browse source 
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: Robert Morell <rmorell@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Robert Morell 2011-01-26 19:06:47 -08:00 committed by Greg Kroah-Hartman
parent d25bc4db72
commit c8cf203a1d
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/usb/core/hcd.c
View file

@ -1262,7 +1262,7 @@ static void hcd_free_coherent(struct usb_bus *bus, dma_addr_t *dma_handle,
*dma_handle = 0; *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) if (urb->transfer_flags & URB_SETUP_MAP_SINGLE)
dma_unmap_single(hcd->self.controller, 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 */ /* Make it safe to call this routine more than once */
urb->transfer_flags &= ~(URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL); 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; 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; dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
if (urb->transfer_flags & URB_DMA_MAP_SG) 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->transfer_flags &= ~(URB_DMA_MAP_SG | URB_DMA_MAP_PAGE |
URB_DMA_MAP_SINGLE | URB_MAP_LOCAL); 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, static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
gfp_t mem_flags) 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 | if (ret && (urb->transfer_flags & (URB_SETUP_MAP_SINGLE |
URB_SETUP_MAP_LOCAL))) URB_SETUP_MAP_LOCAL)))
unmap_urb_for_dma(hcd, urb); usb_hcd_unmap_urb_for_dma(hcd, urb);
} }
return ret; return ret;
} }
@ -1451,7 +1451,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
if (likely(status == 0)) { if (likely(status == 0)) {
status = hcd->driver->urb_enqueue(hcd, urb, mem_flags); status = hcd->driver->urb_enqueue(hcd, urb, mem_flags);
if (unlikely(status)) 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))
status = -EREMOTEIO; status = -EREMOTEIO;
unmap_urb_for_dma(hcd, urb); usb_hcd_unmap_urb_for_dma(hcd, urb);
usbmon_urb_complete(&hcd->self, urb, status); usbmon_urb_complete(&hcd->self, urb, status);
usb_unanchor_urb(urb); usb_unanchor_urb(urb);

5
drivers/usb/host/imx21-hcd.c
View file

@ -927,7 +927,8 @@ static void schedule_nonisoc_etd(struct imx21 *imx21, struct urb *urb)
if (state == US_CTRL_SETUP) { if (state == US_CTRL_SETUP) {
dir = TD_DIR_SETUP; dir = TD_DIR_SETUP;
if (unsuitable_for_dma(urb->setup_dma)) 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->dma_handle = urb->setup_dma;
etd->cpu_buffer = urb->setup_packet; etd->cpu_buffer = urb->setup_packet;
bufround = 0; 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; dir = usb_pipeout(pipe) ? TD_DIR_OUT : TD_DIR_IN;
bufround = (dir == TD_DIR_IN) ? 1 : 0; bufround = (dir == TD_DIR_IN) ? 1 : 0;
if (unsuitable_for_dma(urb->transfer_dma)) 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->dma_handle = urb->transfer_dma;
etd->cpu_buffer = urb->transfer_buffer; etd->cpu_buffer = urb->transfer_buffer;

4
drivers/usb/musb/musb_host.c
View file

@ -1336,7 +1336,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)
if (length > qh->maxpacket) if (length > qh->maxpacket)
length = qh->maxpacket; length = qh->maxpacket;
/* Unmap the buffer so that CPU can use it */ /* 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); musb_write_fifo(hw_ep, length, urb->transfer_buffer + offset);
qh->segsize = length; qh->segsize = length;
@ -1758,7 +1758,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
if (!dma) { if (!dma) {
/* Unmap the buffer so that CPU can use it */ /* 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, done = musb_host_packet_rx(musb, urb,
epnum, iso_err); epnum, iso_err);
DBG(6, "read %spacket\n", done ? "last " : ""); DBG(6, "read %spacket\n", done ? "last " : "");

4
include/linux/usb/hcd.h
View file

@ -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 int usb_hcd_unlink_urb(struct urb *urb, int status);
extern void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb, extern void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb,
int status); int status);
extern void unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *); extern void usb_hcd_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_for_dma(struct usb_hcd *, struct urb *);
extern void usb_hcd_flush_endpoint(struct usb_device *udev, extern void usb_hcd_flush_endpoint(struct usb_device *udev,
struct usb_host_endpoint *ep); struct usb_host_endpoint *ep);
extern void usb_hcd_disable_endpoint(struct usb_device *udev, extern void usb_hcd_disable_endpoint(struct usb_device *udev,