diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-11-29 20:10:16 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-11-29 20:10:16 -0800 |
| commit | 96f79c34e4075cf3e7d7bbf79707c4326a8ea9bf (patch) | |
| tree | 391139345da7ed16df2c37796b1064e5dee66e6a | |
| parent | 2f32797603ef6cbbb83a9ad855b67397fec1709e (diff) | |
USB: move a internal usbfs only structure out of a public header file.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
| -rw-r--r-- | drivers/usb/core/usb.h | 15 | ||||
| -rw-r--r-- | include/linux/usbdevice_fs.h | 25 |
2 files changed, 15 insertions, 25 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 30d2cf7dd762..4035ff925c99 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -33,3 +33,18 @@ extern struct usb_driver usbfs_driver; extern struct file_operations usbfs_devices_fops; extern struct file_operations usbfs_device_file_operations; extern void usbfs_conn_disc_event(void); + +struct dev_state { + struct list_head list; /* state list */ + struct usb_device *dev; + struct file *file; + spinlock_t lock; /* protects the async urb lists */ + struct list_head async_pending; + struct list_head async_completed; + wait_queue_head_t wait; /* wake up if a request completed */ + unsigned int discsignr; + struct task_struct *disctask; + void __user *disccontext; + unsigned long ifclaimed; +}; + diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h index af49afaf7bb4..aed8193eb420 100644 --- a/include/linux/usbdevice_fs.h +++ b/include/linux/usbdevice_fs.h @@ -144,29 +144,4 @@ struct usbdevfs_hub_portinfo { #define USBDEVFS_DISCONNECT _IO('U', 22) #define USBDEVFS_CONNECT _IO('U', 23) -/* --------------------------------------------------------------------- */ - -#ifdef __KERNEL__ - -#include <linux/list.h> -#include <asm/semaphore.h> - - -struct dev_state { - struct list_head list; /* state list */ - struct usb_device *dev; - struct file *file; - spinlock_t lock; /* protects the async urb lists */ - struct list_head async_pending; - struct list_head async_completed; - wait_queue_head_t wait; /* wake up if a request completed */ - unsigned int discsignr; - struct task_struct *disctask; - void __user *disccontext; - unsigned long ifclaimed; -}; - -#endif /* __KERNEL__ */ - -/* --------------------------------------------------------------------- */ #endif /* _LINUX_USBDEVICE_FS_H */ |