diff options
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index c944e8f06a4a..d2bd0c8e0154 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -103,8 +103,7 @@ enum usb_interface_condition { | |||
| 103 | * @condition: binding state of the interface: not bound, binding | 103 | * @condition: binding state of the interface: not bound, binding |
| 104 | * (in probe()), bound to a driver, or unbinding (in disconnect()) | 104 | * (in probe()), bound to a driver, or unbinding (in disconnect()) |
| 105 | * @dev: driver model's view of this device | 105 | * @dev: driver model's view of this device |
| 106 | * @usb_dev: if an interface is bound to the USB major, this will point | 106 | * @class_dev: driver model's class view of this device. |
| 107 | * to the sysfs representation for that device. | ||
| 108 | * | 107 | * |
| 109 | * USB device drivers attach to interfaces on a physical device. Each | 108 | * USB device drivers attach to interfaces on a physical device. Each |
| 110 | * interface encapsulates a single high level function, such as feeding | 109 | * interface encapsulates a single high level function, such as feeding |
| @@ -144,7 +143,7 @@ struct usb_interface { | |||
| 144 | * bound to */ | 143 | * bound to */ |
| 145 | enum usb_interface_condition condition; /* state of binding */ | 144 | enum usb_interface_condition condition; /* state of binding */ |
| 146 | struct device dev; /* interface specific device info */ | 145 | struct device dev; /* interface specific device info */ |
| 147 | struct device *usb_dev; /* pointer to the usb class's device, if any */ | 146 | struct class_device *class_dev; |
| 148 | }; | 147 | }; |
| 149 | #define to_usb_interface(d) container_of(d, struct usb_interface, dev) | 148 | #define to_usb_interface(d) container_of(d, struct usb_interface, dev) |
| 150 | #define interface_to_usbdev(intf) \ | 149 | #define interface_to_usbdev(intf) \ |
| @@ -361,7 +360,7 @@ struct usb_device { | |||
| 361 | char *serial; /* iSerialNumber string, if present */ | 360 | char *serial; /* iSerialNumber string, if present */ |
| 362 | 361 | ||
| 363 | struct list_head filelist; | 362 | struct list_head filelist; |
| 364 | struct device *usbfs_dev; | 363 | struct class_device *class_dev; |
| 365 | struct dentry *usbfs_dentry; /* usbfs dentry entry for the device */ | 364 | struct dentry *usbfs_dentry; /* usbfs dentry entry for the device */ |
| 366 | 365 | ||
| 367 | /* | 366 | /* |
