diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-14 09:20:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-14 09:20:37 -0700 |
| commit | fa286188ce0fce994c3fc2bddcafeb948834591f (patch) | |
| tree | 72abc08a625c4341fc6606fdd547ed320b81fc66 /include/linux | |
| parent | e44694e858ed000ef11ee37861c7f7c86d8ddbda (diff) | |
Revert "usb: move struct usb_device->children to struct usb_hub_port->child"
This reverts commit bebc56d58dc780539777d2b1ca80df5566e2ad87.
The call here is fragile and not well thought out, so revert it, it's
not fully baked yet and I don't want this to go into 3.5.
Cc: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 69163a0abe9..5483cd70390 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -424,6 +424,7 @@ enum usb_device_removable { * access from userspace * @usbfs_dentry: usbfs dentry entry for the device * @maxchild: number of ports if hub + * @children: child devices - USB devices that are attached to this hub * @quirks: quirks of the whole device * @urbnum: number of URBs submitted for the whole device * @active_duration: total time device is not suspended @@ -490,6 +491,7 @@ struct usb_device { struct list_head filelist; int maxchild; + struct usb_device **children; u32 quirks; atomic_t urbnum; @@ -515,8 +517,6 @@ static inline struct usb_device *interface_to_usbdev(struct usb_interface *intf) extern struct usb_device *usb_get_dev(struct usb_device *dev); extern void usb_put_dev(struct usb_device *dev); -extern struct usb_device *usb_get_hub_child_device(struct usb_device *hdev, - int port1); /* USB device locking */ #define usb_lock_device(udev) device_lock(&(udev)->dev) |