diff options
author | Robert Morell <rmorell@nvidia.com> | 2011-01-26 22:06:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 14:48:18 -0500 |
commit | c8cf203a1d228fa001b95534f639ffb7a23d5386 (patch) | |
tree | 73192ffb1334abf40a62f87e94f870801fc1f629 /drivers/usb/core | |
parent | d25bc4db723a44c097268b466ff74bfba4bcc4f3 (diff) |
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: Robert Morell <rmorell@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/hcd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 6a95017fa62b..335c1ddb260d 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -1262,7 +1262,7 @@ static void hcd_free_coherent(struct usb_bus *bus, dma_addr_t *dma_handle, | |||
1262 | *dma_handle = 0; | 1262 | *dma_handle = 0; |
1263 | } | 1263 | } |
1264 | 1264 | ||
1265 | void unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb) | 1265 | void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb) |
1266 | { | 1266 | { |
1267 | if (urb->transfer_flags & URB_SETUP_MAP_SINGLE) | 1267 | if (urb->transfer_flags & URB_SETUP_MAP_SINGLE) |
1268 | dma_unmap_single(hcd->self.controller, | 1268 | dma_unmap_single(hcd->self.controller, |
@@ -1279,13 +1279,13 @@ void unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb) | |||
1279 | /* Make it safe to call this routine more than once */ | 1279 | /* Make it safe to call this routine more than once */ |
1280 | urb->transfer_flags &= ~(URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL); | 1280 | urb->transfer_flags &= ~(URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL); |
1281 | } | 1281 | } |
1282 | EXPORT_SYMBOL_GPL(unmap_urb_setup_for_dma); | 1282 | EXPORT_SYMBOL_GPL(usb_hcd_unmap_urb_setup_for_dma); |
1283 | 1283 | ||
1284 | void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb) | 1284 | void usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb) |
1285 | { | 1285 | { |
1286 | enum dma_data_direction dir; | 1286 | enum dma_data_direction dir; |
1287 | 1287 | ||
1288 | unmap_urb_setup_for_dma(hcd, urb); | 1288 | usb_hcd_unmap_urb_setup_for_dma(hcd, urb); |
1289 | 1289 | ||
1290 | dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; | 1290 | dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE; |
1291 | if (urb->transfer_flags & URB_DMA_MAP_SG) | 1291 | if (urb->transfer_flags & URB_DMA_MAP_SG) |
@@ -1314,7 +1314,7 @@ void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb) | |||
1314 | urb->transfer_flags &= ~(URB_DMA_MAP_SG | URB_DMA_MAP_PAGE | | 1314 | urb->transfer_flags &= ~(URB_DMA_MAP_SG | URB_DMA_MAP_PAGE | |
1315 | URB_DMA_MAP_SINGLE | URB_MAP_LOCAL); | 1315 | URB_DMA_MAP_SINGLE | URB_MAP_LOCAL); |
1316 | } | 1316 | } |
1317 | EXPORT_SYMBOL_GPL(unmap_urb_for_dma); | 1317 | EXPORT_SYMBOL_GPL(usb_hcd_unmap_urb_for_dma); |
1318 | 1318 | ||
1319 | static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, | 1319 | static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, |
1320 | gfp_t mem_flags) | 1320 | gfp_t mem_flags) |
@@ -1410,7 +1410,7 @@ static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, | |||
1410 | } | 1410 | } |
1411 | if (ret && (urb->transfer_flags & (URB_SETUP_MAP_SINGLE | | 1411 | if (ret && (urb->transfer_flags & (URB_SETUP_MAP_SINGLE | |
1412 | URB_SETUP_MAP_LOCAL))) | 1412 | URB_SETUP_MAP_LOCAL))) |
1413 | unmap_urb_for_dma(hcd, urb); | 1413 | usb_hcd_unmap_urb_for_dma(hcd, urb); |
1414 | } | 1414 | } |
1415 | return ret; | 1415 | return ret; |
1416 | } | 1416 | } |
@@ -1451,7 +1451,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) | |||
1451 | if (likely(status == 0)) { | 1451 | if (likely(status == 0)) { |
1452 | status = hcd->driver->urb_enqueue(hcd, urb, mem_flags); | 1452 | status = hcd->driver->urb_enqueue(hcd, urb, mem_flags); |
1453 | if (unlikely(status)) | 1453 | if (unlikely(status)) |
1454 | unmap_urb_for_dma(hcd, urb); | 1454 | usb_hcd_unmap_urb_for_dma(hcd, urb); |
1455 | } | 1455 | } |
1456 | } | 1456 | } |
1457 | 1457 | ||
@@ -1557,7 +1557,7 @@ void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb, int status) | |||
1557 | !status)) | 1557 | !status)) |
1558 | status = -EREMOTEIO; | 1558 | status = -EREMOTEIO; |
1559 | 1559 | ||
1560 | unmap_urb_for_dma(hcd, urb); | 1560 | usb_hcd_unmap_urb_for_dma(hcd, urb); |
1561 | usbmon_urb_complete(&hcd->self, urb, status); | 1561 | usbmon_urb_complete(&hcd->self, urb, status); |
1562 | usb_unanchor_urb(urb); | 1562 | usb_unanchor_urb(urb); |
1563 | 1563 | ||