aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2008-03-01 01:03:07 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-03 13:47:14 -0500
commitd0bcabcd72dda5f553322a1ca92ae31c15b408b6 (patch)
tree6603d13be28005cbbf67a9a3a3649db7a4db14b8
parente59e4a09729b06a131de9042b2a5b05b7ad26174 (diff)
docbook: fix usb source files
Fix docbook problems in USB source files. These cause the generated docbook to be incorrect. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/usb/core/usb.c6
-rw-r--r--include/linux/usb.h9
2 files changed, 5 insertions, 10 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 4e984060c984..f6f19908f5f0 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -99,8 +99,7 @@ struct usb_interface *usb_ifnum_to_if(const struct usb_device *dev,
99EXPORT_SYMBOL_GPL(usb_ifnum_to_if); 99EXPORT_SYMBOL_GPL(usb_ifnum_to_if);
100 100
101/** 101/**
102 * usb_altnum_to_altsetting - get the altsetting structure with a given 102 * usb_altnum_to_altsetting - get the altsetting structure with a given alternate setting number.
103 * alternate setting number.
104 * @intf: the interface containing the altsetting in question 103 * @intf: the interface containing the altsetting in question
105 * @altnum: the desired alternate setting number 104 * @altnum: the desired alternate setting number
106 * 105 *
@@ -442,8 +441,7 @@ EXPORT_SYMBOL_GPL(usb_put_intf);
442 */ 441 */
443 442
444/** 443/**
445 * usb_lock_device_for_reset - cautiously acquire the lock for a 444 * usb_lock_device_for_reset - cautiously acquire the lock for a usb device structure
446 * usb device structure
447 * @udev: device that's being locked 445 * @udev: device that's being locked
448 * @iface: interface bound to the driver making the request (optional) 446 * @iface: interface bound to the driver making the request (optional)
449 * 447 *
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 2372e2e6b527..5bd3ae8aaaf4 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -781,8 +781,7 @@ static inline int usb_endpoint_is_isoc_out(
781 .idVendor = (vend), \ 781 .idVendor = (vend), \
782 .idProduct = (prod) 782 .idProduct = (prod)
783/** 783/**
784 * USB_DEVICE_VER - macro used to describe a specific usb device with a 784 * USB_DEVICE_VER - describe a specific usb device with a version range
785 * version range
786 * @vend: the 16 bit USB Vendor ID 785 * @vend: the 16 bit USB Vendor ID
787 * @prod: the 16 bit USB Product ID 786 * @prod: the 16 bit USB Product ID
788 * @lo: the bcdDevice_lo value 787 * @lo: the bcdDevice_lo value
@@ -799,8 +798,7 @@ static inline int usb_endpoint_is_isoc_out(
799 .bcdDevice_hi = (hi) 798 .bcdDevice_hi = (hi)
800 799
801/** 800/**
802 * USB_DEVICE_INTERFACE_PROTOCOL - macro used to describe a usb 801 * USB_DEVICE_INTERFACE_PROTOCOL - describe a usb device with a specific interface protocol
803 * device with a specific interface protocol
804 * @vend: the 16 bit USB Vendor ID 802 * @vend: the 16 bit USB Vendor ID
805 * @prod: the 16 bit USB Product ID 803 * @prod: the 16 bit USB Product ID
806 * @pr: bInterfaceProtocol value 804 * @pr: bInterfaceProtocol value
@@ -846,8 +844,7 @@ static inline int usb_endpoint_is_isoc_out(
846 .bInterfaceProtocol = (pr) 844 .bInterfaceProtocol = (pr)
847 845
848/** 846/**
849 * USB_DEVICE_AND_INTERFACE_INFO - macro used to describe a specific usb device 847 * USB_DEVICE_AND_INTERFACE_INFO - describe a specific usb device with a class of usb interfaces
850 * with a class of usb interfaces
851 * @vend: the 16 bit USB Vendor ID 848 * @vend: the 16 bit USB Vendor ID
852 * @prod: the 16 bit USB Product ID 849 * @prod: the 16 bit USB Product ID
853 * @cl: bInterfaceClass value 850 * @cl: bInterfaceClass value