These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / storage / usb.h

diff --git a/kernel/drivers/usb/storage/usb.h b/kernel/drivers/usb/storage/usb.h
index 307e339..da0ad32 100644 (file)
--- a/kernel/drivers/usb/storage/usb.h
+++ b/kernel/drivers/usb/storage/usb.h
@@ -197,11 +197,25 @@ extern int usb_stor_post_reset(struct usb_interface *iface);
 extern int usb_stor_probe1(struct us_data **pus,
                struct usb_interface *intf,
                const struct usb_device_id *id,
-               struct us_unusual_dev *unusual_dev);
+               struct us_unusual_dev *unusual_dev,
+               struct scsi_host_template *sht);
 extern int usb_stor_probe2(struct us_data *us);
 extern void usb_stor_disconnect(struct usb_interface *intf);
 
 extern void usb_stor_adjust_quirks(struct usb_device *dev,
                unsigned long *fflags);
 
+#define module_usb_stor_driver(__driver, __sht, __name) \
+static int __init __driver##_init(void) \
+{ \
+       usb_stor_host_template_init(&(__sht), __name, THIS_MODULE); \
+       return usb_register(&(__driver)); \
+} \
+module_init(__driver##_init); \
+static void __exit __driver##_exit(void) \
+{ \
+       usb_deregister(&(__driver)); \
+} \
+module_exit(__driver##_exit)
+
 #endif