This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 18ee075..a43c95a 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -61,13 +61,6 @@ struct usb_host_interface {
        int extralen;
 };
 
-enum usb_interface_condition {
-       USB_INTERFACE_UNBOUND = 0,
-       USB_INTERFACE_BINDING,
-       USB_INTERFACE_BOUND,
-       USB_INTERFACE_UNBINDING,
-};
-
 /**
  * struct usb_interface - what usb device drivers talk to
  * @altsetting: array of interface structures, one for each alternate
@@ -82,8 +75,6 @@ enum usb_interface_condition {
  *     be unused.  The driver should set this value in the probe()
  *     function of the driver, after it has been assigned a minor
  *     number from the USB core by calling usb_register_dev().
- * @condition: binding state of the interface: not bound, binding
- *     (in probe()), bound to a driver, or unbinding (in disconnect())
  * @dev: driver model's view of this device
  * @class_dev: driver model's class view of this device.
  *
@@ -122,7 +113,6 @@ struct usb_interface {
        unsigned num_altsetting;        /* number of alternate settings */
 
        int minor;                      /* minor number this interface is bound to */
-       enum usb_interface_condition condition;         /* state of binding */
        struct device dev;              /* interface specific device info */
        struct class_device *class_dev;
 };
@@ -274,6 +264,7 @@ struct usb_bus {
        int bandwidth_isoc_reqs;        /* number of Isoc. requests */
 
        struct dentry *usbfs_dentry;    /* usbfs dentry entry for the bus */
+       struct dentry *usbdevfs_dentry; /* usbdevfs dentry entry for the bus */
 
        struct class_device class_dev;  /* class device for this bus */
        void (*release)(struct usb_bus *bus);   /* function to destroy this bus's memory */
@@ -291,14 +282,6 @@ struct usb_bus {
 
 struct usb_tt;
 
-/*
- * struct usb_device - kernel's representation of a USB device
- *
- * FIXME: Write the kerneldoc!
- *
- * Usbcore drivers should not set usbdev->state directly.  Instead use
- * usb_set_device_state().
- */
 struct usb_device {
        int             devnum;         /* Address on USB bus */
        char            devpath [16];   /* Use in messages: /port/port/... */
@@ -332,6 +315,7 @@ struct usb_device {
        
        struct list_head filelist;
        struct dentry *usbfs_dentry;    /* usbfs dentry entry for the device */
+       struct dentry *usbdevfs_dentry; /* usbdevfs dentry entry for the device */
 
        /*
         * Child devices - these can be either new devices
@@ -349,14 +333,9 @@ struct usb_device {
 extern struct usb_device *usb_get_dev(struct usb_device *dev);
 extern void usb_put_dev(struct usb_device *dev);
 
-extern void usb_lock_device(struct usb_device *udev);
-extern int usb_trylock_device(struct usb_device *udev);
-extern int usb_lock_device_for_reset(struct usb_device *udev,
-               struct usb_interface *iface);
-extern void usb_unlock_device(struct usb_device *udev);
-
-/* USB port reset for device reinitialization */
+/* mostly for devices emulating SCSI over USB */
 extern int usb_reset_device(struct usb_device *dev);
+extern int __usb_reset_device(struct usb_device *dev);
 
 extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);