diff options
author | Oliver Neukum <oneukum@suse.de> | 2007-01-23 15:55:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:44:40 -0500 |
commit | 9251644ab33579d80c038b077f78daa23a04fdcd (patch) | |
tree | c57746f60a5728537baf03824ed51787e55a3fcc /drivers/usb/core/usb.c | |
parent | 1096f780d0b9d6bade2d42bf823e81db3e553abe (diff) |
usbcore: trivial whitespace fixes
This patch (as844) makes some trivial whitespace fixes to a few files
in usbcore. Oliver did most of the work and Alan added some tidying up.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/usb.c')
-rw-r--r-- | drivers/usb/core/usb.c | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 02426d0b9a3..3db721cd557 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -233,7 +233,7 @@ static void usb_autosuspend_work(struct work_struct *work) | |||
233 | * @parent: hub to which device is connected; null to allocate a root hub | 233 | * @parent: hub to which device is connected; null to allocate a root hub |
234 | * @bus: bus used to access the device | 234 | * @bus: bus used to access the device |
235 | * @port1: one-based index of port; ignored for root hubs | 235 | * @port1: one-based index of port; ignored for root hubs |
236 | * Context: !in_interrupt () | 236 | * Context: !in_interrupt() |
237 | * | 237 | * |
238 | * Only hub drivers (including virtual root hub drivers for host | 238 | * Only hub drivers (including virtual root hub drivers for host |
239 | * controllers) should ever call this. | 239 | * controllers) should ever call this. |
@@ -277,22 +277,22 @@ usb_alloc_dev(struct usb_device *parent, struct usb_bus *bus, unsigned port1) | |||
277 | * as stable: bus->busnum changes easily from modprobe order, | 277 | * as stable: bus->busnum changes easily from modprobe order, |
278 | * cardbus or pci hotplugging, and so on. | 278 | * cardbus or pci hotplugging, and so on. |
279 | */ | 279 | */ |
280 | if (unlikely (!parent)) { | 280 | if (unlikely(!parent)) { |
281 | dev->devpath [0] = '0'; | 281 | dev->devpath[0] = '0'; |
282 | 282 | ||
283 | dev->dev.parent = bus->controller; | 283 | dev->dev.parent = bus->controller; |
284 | sprintf (&dev->dev.bus_id[0], "usb%d", bus->busnum); | 284 | sprintf(&dev->dev.bus_id[0], "usb%d", bus->busnum); |
285 | } else { | 285 | } else { |
286 | /* match any labeling on the hubs; it's one-based */ | 286 | /* match any labeling on the hubs; it's one-based */ |
287 | if (parent->devpath [0] == '0') | 287 | if (parent->devpath[0] == '0') |
288 | snprintf (dev->devpath, sizeof dev->devpath, | 288 | snprintf(dev->devpath, sizeof dev->devpath, |
289 | "%d", port1); | 289 | "%d", port1); |
290 | else | 290 | else |
291 | snprintf (dev->devpath, sizeof dev->devpath, | 291 | snprintf(dev->devpath, sizeof dev->devpath, |
292 | "%s.%d", parent->devpath, port1); | 292 | "%s.%d", parent->devpath, port1); |
293 | 293 | ||
294 | dev->dev.parent = &parent->dev; | 294 | dev->dev.parent = &parent->dev; |
295 | sprintf (&dev->dev.bus_id[0], "%d-%s", | 295 | sprintf(&dev->dev.bus_id[0], "%d-%s", |
296 | bus->busnum, dev->devpath); | 296 | bus->busnum, dev->devpath); |
297 | 297 | ||
298 | /* hub driver sets up TT records */ | 298 | /* hub driver sets up TT records */ |
@@ -463,7 +463,7 @@ static struct usb_device *match_device(struct usb_device *dev, | |||
463 | /* see if this device matches */ | 463 | /* see if this device matches */ |
464 | if ((vendor_id == le16_to_cpu(dev->descriptor.idVendor)) && | 464 | if ((vendor_id == le16_to_cpu(dev->descriptor.idVendor)) && |
465 | (product_id == le16_to_cpu(dev->descriptor.idProduct))) { | 465 | (product_id == le16_to_cpu(dev->descriptor.idProduct))) { |
466 | dev_dbg (&dev->dev, "matched this device!\n"); | 466 | dev_dbg(&dev->dev, "matched this device!\n"); |
467 | ret_dev = usb_get_dev(dev); | 467 | ret_dev = usb_get_dev(dev); |
468 | goto exit; | 468 | goto exit; |
469 | } | 469 | } |
@@ -535,7 +535,7 @@ exit: | |||
535 | */ | 535 | */ |
536 | int usb_get_current_frame_number(struct usb_device *dev) | 536 | int usb_get_current_frame_number(struct usb_device *dev) |
537 | { | 537 | { |
538 | return usb_hcd_get_frame_number (dev); | 538 | return usb_hcd_get_frame_number(dev); |
539 | } | 539 | } |
540 | 540 | ||
541 | /*-------------------------------------------------------------------*/ | 541 | /*-------------------------------------------------------------------*/ |
@@ -593,7 +593,7 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size, | |||
593 | * | 593 | * |
594 | * When the buffer is no longer used, free it with usb_buffer_free(). | 594 | * When the buffer is no longer used, free it with usb_buffer_free(). |
595 | */ | 595 | */ |
596 | void *usb_buffer_alloc ( | 596 | void *usb_buffer_alloc( |
597 | struct usb_device *dev, | 597 | struct usb_device *dev, |
598 | size_t size, | 598 | size_t size, |
599 | gfp_t mem_flags, | 599 | gfp_t mem_flags, |
@@ -602,7 +602,7 @@ void *usb_buffer_alloc ( | |||
602 | { | 602 | { |
603 | if (!dev || !dev->bus) | 603 | if (!dev || !dev->bus) |
604 | return NULL; | 604 | return NULL; |
605 | return hcd_buffer_alloc (dev->bus, size, mem_flags, dma); | 605 | return hcd_buffer_alloc(dev->bus, size, mem_flags, dma); |
606 | } | 606 | } |
607 | 607 | ||
608 | /** | 608 | /** |
@@ -616,7 +616,7 @@ void *usb_buffer_alloc ( | |||
616 | * been allocated using usb_buffer_alloc(), and the parameters must match | 616 | * been allocated using usb_buffer_alloc(), and the parameters must match |
617 | * those provided in that allocation request. | 617 | * those provided in that allocation request. |
618 | */ | 618 | */ |
619 | void usb_buffer_free ( | 619 | void usb_buffer_free( |
620 | struct usb_device *dev, | 620 | struct usb_device *dev, |
621 | size_t size, | 621 | size_t size, |
622 | void *addr, | 622 | void *addr, |
@@ -627,7 +627,7 @@ void usb_buffer_free ( | |||
627 | return; | 627 | return; |
628 | if (!addr) | 628 | if (!addr) |
629 | return; | 629 | return; |
630 | hcd_buffer_free (dev->bus, size, addr, dma); | 630 | hcd_buffer_free(dev->bus, size, addr, dma); |
631 | } | 631 | } |
632 | 632 | ||
633 | /** | 633 | /** |
@@ -647,7 +647,7 @@ void usb_buffer_free ( | |||
647 | * Reverse the effect of this call with usb_buffer_unmap(). | 647 | * Reverse the effect of this call with usb_buffer_unmap(). |
648 | */ | 648 | */ |
649 | #if 0 | 649 | #if 0 |
650 | struct urb *usb_buffer_map (struct urb *urb) | 650 | struct urb *usb_buffer_map(struct urb *urb) |
651 | { | 651 | { |
652 | struct usb_bus *bus; | 652 | struct usb_bus *bus; |
653 | struct device *controller; | 653 | struct device *controller; |
@@ -659,14 +659,14 @@ struct urb *usb_buffer_map (struct urb *urb) | |||
659 | return NULL; | 659 | return NULL; |
660 | 660 | ||
661 | if (controller->dma_mask) { | 661 | if (controller->dma_mask) { |
662 | urb->transfer_dma = dma_map_single (controller, | 662 | urb->transfer_dma = dma_map_single(controller, |
663 | urb->transfer_buffer, urb->transfer_buffer_length, | 663 | urb->transfer_buffer, urb->transfer_buffer_length, |
664 | usb_pipein (urb->pipe) | 664 | usb_pipein(urb->pipe) |
665 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 665 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
666 | if (usb_pipecontrol (urb->pipe)) | 666 | if (usb_pipecontrol(urb->pipe)) |
667 | urb->setup_dma = dma_map_single (controller, | 667 | urb->setup_dma = dma_map_single(controller, |
668 | urb->setup_packet, | 668 | urb->setup_packet, |
669 | sizeof (struct usb_ctrlrequest), | 669 | sizeof(struct usb_ctrlrequest), |
670 | DMA_TO_DEVICE); | 670 | DMA_TO_DEVICE); |
671 | // FIXME generic api broken like pci, can't report errors | 671 | // FIXME generic api broken like pci, can't report errors |
672 | // if (urb->transfer_dma == DMA_ADDR_INVALID) return 0; | 672 | // if (urb->transfer_dma == DMA_ADDR_INVALID) return 0; |
@@ -689,7 +689,7 @@ struct urb *usb_buffer_map (struct urb *urb) | |||
689 | * usb_buffer_dmasync - synchronize DMA and CPU view of buffer(s) | 689 | * usb_buffer_dmasync - synchronize DMA and CPU view of buffer(s) |
690 | * @urb: urb whose transfer_buffer/setup_packet will be synchronized | 690 | * @urb: urb whose transfer_buffer/setup_packet will be synchronized |
691 | */ | 691 | */ |
692 | void usb_buffer_dmasync (struct urb *urb) | 692 | void usb_buffer_dmasync(struct urb *urb) |
693 | { | 693 | { |
694 | struct usb_bus *bus; | 694 | struct usb_bus *bus; |
695 | struct device *controller; | 695 | struct device *controller; |
@@ -702,14 +702,14 @@ void usb_buffer_dmasync (struct urb *urb) | |||
702 | return; | 702 | return; |
703 | 703 | ||
704 | if (controller->dma_mask) { | 704 | if (controller->dma_mask) { |
705 | dma_sync_single (controller, | 705 | dma_sync_single(controller, |
706 | urb->transfer_dma, urb->transfer_buffer_length, | 706 | urb->transfer_dma, urb->transfer_buffer_length, |
707 | usb_pipein (urb->pipe) | 707 | usb_pipein(urb->pipe) |
708 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 708 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
709 | if (usb_pipecontrol (urb->pipe)) | 709 | if (usb_pipecontrol(urb->pipe)) |
710 | dma_sync_single (controller, | 710 | dma_sync_single(controller, |
711 | urb->setup_dma, | 711 | urb->setup_dma, |
712 | sizeof (struct usb_ctrlrequest), | 712 | sizeof(struct usb_ctrlrequest), |
713 | DMA_TO_DEVICE); | 713 | DMA_TO_DEVICE); |
714 | } | 714 | } |
715 | } | 715 | } |
@@ -722,7 +722,7 @@ void usb_buffer_dmasync (struct urb *urb) | |||
722 | * Reverses the effect of usb_buffer_map(). | 722 | * Reverses the effect of usb_buffer_map(). |
723 | */ | 723 | */ |
724 | #if 0 | 724 | #if 0 |
725 | void usb_buffer_unmap (struct urb *urb) | 725 | void usb_buffer_unmap(struct urb *urb) |
726 | { | 726 | { |
727 | struct usb_bus *bus; | 727 | struct usb_bus *bus; |
728 | struct device *controller; | 728 | struct device *controller; |
@@ -735,14 +735,14 @@ void usb_buffer_unmap (struct urb *urb) | |||
735 | return; | 735 | return; |
736 | 736 | ||
737 | if (controller->dma_mask) { | 737 | if (controller->dma_mask) { |
738 | dma_unmap_single (controller, | 738 | dma_unmap_single(controller, |
739 | urb->transfer_dma, urb->transfer_buffer_length, | 739 | urb->transfer_dma, urb->transfer_buffer_length, |
740 | usb_pipein (urb->pipe) | 740 | usb_pipein(urb->pipe) |
741 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 741 | ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
742 | if (usb_pipecontrol (urb->pipe)) | 742 | if (usb_pipecontrol(urb->pipe)) |
743 | dma_unmap_single (controller, | 743 | dma_unmap_single(controller, |
744 | urb->setup_dma, | 744 | urb->setup_dma, |
745 | sizeof (struct usb_ctrlrequest), | 745 | sizeof(struct usb_ctrlrequest), |
746 | DMA_TO_DEVICE); | 746 | DMA_TO_DEVICE); |
747 | } | 747 | } |
748 | urb->transfer_flags &= ~(URB_NO_TRANSFER_DMA_MAP | 748 | urb->transfer_flags &= ~(URB_NO_TRANSFER_DMA_MAP |
@@ -783,15 +783,15 @@ int usb_buffer_map_sg(const struct usb_device *dev, unsigned pipe, | |||
783 | struct device *controller; | 783 | struct device *controller; |
784 | 784 | ||
785 | if (!dev | 785 | if (!dev |
786 | || usb_pipecontrol (pipe) | 786 | || usb_pipecontrol(pipe) |
787 | || !(bus = dev->bus) | 787 | || !(bus = dev->bus) |
788 | || !(controller = bus->controller) | 788 | || !(controller = bus->controller) |
789 | || !controller->dma_mask) | 789 | || !controller->dma_mask) |
790 | return -1; | 790 | return -1; |
791 | 791 | ||
792 | // FIXME generic api broken like pci, can't report errors | 792 | // FIXME generic api broken like pci, can't report errors |
793 | return dma_map_sg (controller, sg, nents, | 793 | return dma_map_sg(controller, sg, nents, |
794 | usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 794 | usb_pipein(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
795 | } | 795 | } |
796 | 796 | ||
797 | /* XXX DISABLED, no users currently. If you wish to re-enable this | 797 | /* XXX DISABLED, no users currently. If you wish to re-enable this |
@@ -823,8 +823,8 @@ void usb_buffer_dmasync_sg(const struct usb_device *dev, unsigned pipe, | |||
823 | || !controller->dma_mask) | 823 | || !controller->dma_mask) |
824 | return; | 824 | return; |
825 | 825 | ||
826 | dma_sync_sg (controller, sg, n_hw_ents, | 826 | dma_sync_sg(controller, sg, n_hw_ents, |
827 | usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 827 | usb_pipein(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
828 | } | 828 | } |
829 | #endif | 829 | #endif |
830 | 830 | ||
@@ -849,8 +849,8 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, unsigned pipe, | |||
849 | || !controller->dma_mask) | 849 | || !controller->dma_mask) |
850 | return; | 850 | return; |
851 | 851 | ||
852 | dma_unmap_sg (controller, sg, n_hw_ents, | 852 | dma_unmap_sg(controller, sg, n_hw_ents, |
853 | usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); | 853 | usb_pipein(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); |
854 | } | 854 | } |
855 | 855 | ||
856 | /* format to disable USB on kernel command line is: nousb */ | 856 | /* format to disable USB on kernel command line is: nousb */ |
@@ -871,7 +871,7 @@ static int __init usb_init(void) | |||
871 | { | 871 | { |
872 | int retval; | 872 | int retval; |
873 | if (nousb) { | 873 | if (nousb) { |
874 | pr_info ("%s: USB support disabled\n", usbcore_name); | 874 | pr_info("%s: USB support disabled\n", usbcore_name); |
875 | return 0; | 875 | return 0; |
876 | } | 876 | } |
877 | 877 | ||
@@ -971,19 +971,19 @@ EXPORT_SYMBOL(__usb_get_extra_descriptor); | |||
971 | EXPORT_SYMBOL(usb_find_device); | 971 | EXPORT_SYMBOL(usb_find_device); |
972 | EXPORT_SYMBOL(usb_get_current_frame_number); | 972 | EXPORT_SYMBOL(usb_get_current_frame_number); |
973 | 973 | ||
974 | EXPORT_SYMBOL (usb_buffer_alloc); | 974 | EXPORT_SYMBOL(usb_buffer_alloc); |
975 | EXPORT_SYMBOL (usb_buffer_free); | 975 | EXPORT_SYMBOL(usb_buffer_free); |
976 | 976 | ||
977 | #if 0 | 977 | #if 0 |
978 | EXPORT_SYMBOL (usb_buffer_map); | 978 | EXPORT_SYMBOL(usb_buffer_map); |
979 | EXPORT_SYMBOL (usb_buffer_dmasync); | 979 | EXPORT_SYMBOL(usb_buffer_dmasync); |
980 | EXPORT_SYMBOL (usb_buffer_unmap); | 980 | EXPORT_SYMBOL(usb_buffer_unmap); |
981 | #endif | 981 | #endif |
982 | 982 | ||
983 | EXPORT_SYMBOL (usb_buffer_map_sg); | 983 | EXPORT_SYMBOL(usb_buffer_map_sg); |
984 | #if 0 | 984 | #if 0 |
985 | EXPORT_SYMBOL (usb_buffer_dmasync_sg); | 985 | EXPORT_SYMBOL(usb_buffer_dmasync_sg); |
986 | #endif | 986 | #endif |
987 | EXPORT_SYMBOL (usb_buffer_unmap_sg); | 987 | EXPORT_SYMBOL(usb_buffer_unmap_sg); |
988 | 988 | ||
989 | MODULE_LICENSE("GPL"); | 989 | MODULE_LICENSE("GPL"); |