diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 18:42:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 18:42:53 -0400 |
commit | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (patch) | |
tree | 407a3adcf885ffd75a4d3299eaefd9b171b739be /drivers/usb/core/usb.h | |
parent | 6d52dcbe56ca8464bcad56d98a64bcd781596663 (diff) | |
parent | f756cbd458ab71c996a069cb3928fb1e2d7cd9cc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (100 commits)
usb-storage: revert DMA-alignment change for Wireless USB
USB: use reset_resume when normal resume fails
usb_gadget: composite cdc gadget fault handling
usb gadget: minor USBCV fix for composite framework
USB: Fix bug with byte order in isp116x-hcd.c fio write/read
USB: fix double kfree in ipaq in error case
USB: fix build error in cdc-acm for CONFIG_PM=n
USB: remove board-specific UP2OCR configuration from pxa27x-udc
USB: EHCI: Reconciling USB register differences on MPC85xx vs MPC83xx
USB: Fix pointer/int cast in USB devio code
usb gadget: g_cdc dependso on NET
USB: Au1xxx-usb: suspend/resume support.
USB: Au1xxx-usb: clean up ohci/ehci bus glue sources.
usbfs: don't store bad pointers in registration
usbfs: fix race between open and unregister
usbfs: simplify the lookup-by-minor routines
usbfs: send disconnect signals when device is unregistered
USB: Force unbinding of drivers lacking reset_resume or other methods
USB: ohci-pnx4008: I2C cleanups and fixes
USB: debug port converter does not accept more than 8 byte packets
...
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r-- | drivers/usb/core/usb.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 1a8bc21c335e..d9a6e16dbf84 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h | |||
@@ -29,6 +29,8 @@ extern int usb_choose_configuration(struct usb_device *udev); | |||
29 | extern void usb_kick_khubd(struct usb_device *dev); | 29 | extern void usb_kick_khubd(struct usb_device *dev); |
30 | extern int usb_match_device(struct usb_device *dev, | 30 | extern int usb_match_device(struct usb_device *dev, |
31 | const struct usb_device_id *id); | 31 | const struct usb_device_id *id); |
32 | extern void usb_forced_unbind_intf(struct usb_interface *intf); | ||
33 | extern void usb_rebind_intf(struct usb_interface *intf); | ||
32 | 34 | ||
33 | extern int usb_hub_init(void); | 35 | extern int usb_hub_init(void); |
34 | extern void usb_hub_cleanup(void); | 36 | extern void usb_hub_cleanup(void); |
@@ -140,26 +142,11 @@ extern struct usb_driver usbfs_driver; | |||
140 | extern const struct file_operations usbfs_devices_fops; | 142 | extern const struct file_operations usbfs_devices_fops; |
141 | extern const struct file_operations usbdev_file_operations; | 143 | extern const struct file_operations usbdev_file_operations; |
142 | extern void usbfs_conn_disc_event(void); | 144 | extern void usbfs_conn_disc_event(void); |
145 | extern void usb_fs_classdev_common_remove(struct usb_device *udev); | ||
143 | 146 | ||
144 | extern int usb_devio_init(void); | 147 | extern int usb_devio_init(void); |
145 | extern void usb_devio_cleanup(void); | 148 | extern void usb_devio_cleanup(void); |
146 | 149 | ||
147 | struct dev_state { | ||
148 | struct list_head list; /* state list */ | ||
149 | struct usb_device *dev; | ||
150 | struct file *file; | ||
151 | spinlock_t lock; /* protects the async urb lists */ | ||
152 | struct list_head async_pending; | ||
153 | struct list_head async_completed; | ||
154 | wait_queue_head_t wait; /* wake up if a request completed */ | ||
155 | unsigned int discsignr; | ||
156 | struct pid *disc_pid; | ||
157 | uid_t disc_uid, disc_euid; | ||
158 | void __user *disccontext; | ||
159 | unsigned long ifclaimed; | ||
160 | u32 secid; | ||
161 | }; | ||
162 | |||
163 | /* internal notify stuff */ | 150 | /* internal notify stuff */ |
164 | extern void usb_notify_add_device(struct usb_device *udev); | 151 | extern void usb_notify_add_device(struct usb_device *udev); |
165 | extern void usb_notify_remove_device(struct usb_device *udev); | 152 | extern void usb_notify_remove_device(struct usb_device *udev); |