Merge 5.3-rc5 into usb-next

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

diff --git a/include/linux/usb.h b/include/linux/usb.h
index e87826e23d593026f4d2fb2432f418f716585b67..b548c530f988a43fd2d49b4c081e23fe2eafa816 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1151,6 +1151,8 @@ struct usbdrv_wrap {
  * @id_table: USB drivers use ID table to support hotplugging.
  *     Export this with MODULE_DEVICE_TABLE(usb,...).  This must be set
  *     or your driver's probe function will never get called.
+ * @dev_groups: Attributes attached to the device that will be created once it
+ *     is bound to the driver.
  * @dynids: used internally to hold the list of dynamically added device
  *     ids for this driver.
  * @drvwrap: Driver-model core structure wrapper.
@@ -1198,6 +1200,7 @@ struct usb_driver {
        int (*post_reset)(struct usb_interface *intf);
 
        const struct usb_device_id *id_table;
+       const struct attribute_group **dev_groups;
 
        struct usb_dynids dynids;
        struct usbdrv_wrap drvwrap;
@@ -1221,6 +1224,8 @@ struct usb_driver {
  *     module is being unloaded.
  * @suspend: Called when the device is going to be suspended by the system.
  * @resume: Called when the device is being resumed by the system.
+ * @dev_groups: Attributes attached to the device that will be created once it
+ *     is bound to the driver.
  * @drvwrap: Driver-model core structure wrapper.
  * @supports_autosuspend: if set to 0, the USB core will not allow autosuspend
  *     for devices bound to this driver.
@@ -1235,6 +1240,7 @@ struct usb_device_driver {
 
        int (*suspend) (struct usb_device *udev, pm_message_t message);
        int (*resume) (struct usb_device *udev, pm_message_t message);
+       const struct attribute_group **dev_groups;
        struct usbdrv_wrap drvwrap;
        unsigned int supports_autosuspend:1;
 };