USB: convert drivers/usb/* to use module_usb_driver()
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Nov 2011 17:34:02 +0000 (09:34 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Nov 2011 17:34:02 +0000 (09:34 -0800)
This converts the drivers in drivers/usb/* to use the
module_usb_driver() macro which makes the code smaller and a bit
simpler.

Added bonus is that it removes some unneeded kernel log messages about
drivers loading and/or unloading.

Cc: Simon Arlott <cxacru@fire.lp0.eu>
Cc: Duncan Sands <duncan.sands@free.fr>
Cc: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Cc: Oliver Neukum <oliver@neukum.name>
Cc: Juergen Stuber <starblue@users.sourceforge.net>
Cc: Cesar Miquel <miquel@df.uba.ar>
Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Michael Hund <mhund@ld-didactic.de>
Cc: Zack Parsons <k3bacon@gmail.com>
Cc: Melchior FRANZ <mfranz@aon.at>
Cc: Tomoki Sekiyama <tomoki.sekiyama@gmail.com>
Cc: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
40 files changed:
drivers/usb/atm/cxacru.c
drivers/usb/atm/speedtch.c
drivers/usb/atm/ueagle-atm.c
drivers/usb/class/cdc-wdm.c
drivers/usb/class/usblp.c
drivers/usb/class/usbtmc.c
drivers/usb/host/hwa-hc.c
drivers/usb/image/microtek.c
drivers/usb/misc/adutux.c
drivers/usb/misc/cypress_cy7c63.c
drivers/usb/misc/cytherm.c
drivers/usb/misc/emi26.c
drivers/usb/misc/emi62.c
drivers/usb/misc/idmouse.c
drivers/usb/misc/iowarrior.c
drivers/usb/misc/isight_firmware.c
drivers/usb/misc/ldusb.c
drivers/usb/misc/legousbtower.c
drivers/usb/misc/rio500.c
drivers/usb/misc/trancevibrator.c
drivers/usb/misc/usblcd.c
drivers/usb/misc/usbled.c
drivers/usb/misc/usbsevseg.c
drivers/usb/misc/yurex.c
drivers/usb/storage/alauda.c
drivers/usb/storage/cypress_atacb.c
drivers/usb/storage/datafab.c
drivers/usb/storage/ene_ub6250.c
drivers/usb/storage/freecom.c
drivers/usb/storage/isd200.c
drivers/usb/storage/jumpshot.c
drivers/usb/storage/karma.c
drivers/usb/storage/onetouch.c
drivers/usb/storage/realtek_cr.c
drivers/usb/storage/sddr09.c
drivers/usb/storage/sddr55.c
drivers/usb/storage/shuttle_usbat.c
drivers/usb/storage/uas.c
drivers/usb/usb-skeleton.c
drivers/usb/wusbcore/cbaf.c

index a845f8b8382f1d1052f34f57665d46bf1d871132..98b89fe19867cb25fea7ccb8438d50cf37a3ddcc 100644 (file)
@@ -1372,18 +1372,7 @@ static struct usb_driver cxacru_usb_driver = {
        .id_table       = cxacru_usb_ids
 };
 
-static int __init cxacru_init(void)
-{
-       return usb_register(&cxacru_usb_driver);
-}
-
-static void __exit cxacru_cleanup(void)
-{
-       usb_deregister(&cxacru_usb_driver);
-}
-
-module_init(cxacru_init);
-module_exit(cxacru_cleanup);
+module_usb_driver(cxacru_usb_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 0842cfbf60cfcf74ec08b835d469c1f1c8f26ada..b42092e1f1643c580bc09414111867279926b840 100644 (file)
@@ -953,22 +953,7 @@ static int speedtch_usb_probe(struct usb_interface *intf, const struct usb_devic
        return usbatm_usb_probe(intf, id, &speedtch_usbatm_driver);
 }
 
-static int __init speedtch_usb_init(void)
-{
-       dbg("%s: driver version %s", __func__, DRIVER_VERSION);
-
-       return usb_register(&speedtch_usb_driver);
-}
-
-static void __exit speedtch_usb_cleanup(void)
-{
-       dbg("%s", __func__);
-
-       usb_deregister(&speedtch_usb_driver);
-}
-
-module_init(speedtch_usb_init);
-module_exit(speedtch_usb_cleanup);
+module_usb_driver(speedtch_usb_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 428f36801e06d8e206652202dd9ccd14dc2f6c05..00f171a7a8a01f91f5d58ebc4d1e51851e3e5b55 100644 (file)
@@ -2753,36 +2753,7 @@ static struct usb_driver uea_driver = {
 
 MODULE_DEVICE_TABLE(usb, uea_ids);
 
-/**
- * uea_init - Initialize the module.
- *      Register to USB subsystem
- */
-static int __init uea_init(void)
-{
-       printk(KERN_INFO "[ueagle-atm] driver " EAGLEUSBVERSION " loaded\n");
-
-       usb_register(&uea_driver);
-
-       return 0;
-}
-
-module_init(uea_init);
-
-/**
- * uea_exit  -  Destroy module
- *    Deregister with USB subsystem
- */
-static void __exit uea_exit(void)
-{
-       /*
-        * This calls automatically the uea_disconnect method if necessary:
-        */
-       usb_deregister(&uea_driver);
-
-       printk(KERN_INFO "[ueagle-atm] driver unloaded\n");
-}
-
-module_exit(uea_exit);
+module_usb_driver(uea_driver);
 
 MODULE_AUTHOR("Damien Bergamini/Matthieu Castet/Stanislaw W. Gruszka");
 MODULE_DESCRIPTION("ADI 930/Eagle USB ADSL Modem driver");
index efe684908c1f092f79937fb1b196bcc32fd4751d..1c50baff7725ec2d8e368b3c34f50925a76f3804 100644 (file)
@@ -895,24 +895,7 @@ static struct usb_driver wdm_driver = {
        .supports_autosuspend = 1,
 };
 
-/* --- low level module stuff --- */
-
-static int __init wdm_init(void)
-{
-       int rv;
-
-       rv = usb_register(&wdm_driver);
-
-       return rv;
-}
-
-static void __exit wdm_exit(void)
-{
-       usb_deregister(&wdm_driver);
-}
-
-module_init(wdm_init);
-module_exit(wdm_exit);
+module_usb_driver(wdm_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index cb3a93243a052f6bdb4f6455c0f4e44a54e82ee9..81ef2e207a8d2ac0f7c8f1191fa1207cb9b48a79 100644 (file)
@@ -1412,18 +1412,7 @@ static struct usb_driver usblp_driver = {
        .supports_autosuspend = 1,
 };
 
-static int __init usblp_init(void)
-{
-       return usb_register(&usblp_driver);
-}
-
-static void __exit usblp_exit(void)
-{
-       usb_deregister(&usblp_driver);
-}
-
-module_init(usblp_init);
-module_exit(usblp_exit);
+module_usb_driver(usblp_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 12cf5e7395a82c5fcadee6e9b775a1fe5f6f079f..70d69d06054f2faeaa1d4c9b2954d5cc0ca6e5b4 100644 (file)
@@ -1116,21 +1116,6 @@ static struct usb_driver usbtmc_driver = {
        .resume         = usbtmc_resume,
 };
 
-static int __init usbtmc_init(void)
-{
-       int retcode;
-
-       retcode = usb_register(&usbtmc_driver);
-       if (retcode)
-               printk(KERN_ERR KBUILD_MODNAME": Unable to register driver\n");
-       return retcode;
-}
-module_init(usbtmc_init);
-
-static void __exit usbtmc_exit(void)
-{
-       usb_deregister(&usbtmc_driver);
-}
-module_exit(usbtmc_exit);
+module_usb_driver(usbtmc_driver);
 
 MODULE_LICENSE("GPL");
index 9bfac657572e2eb4aadb9aaec3899ac887448986..056fb2d37c88cff9b5988977bed09d437d080be4 100644 (file)
@@ -837,18 +837,7 @@ static struct usb_driver hwahc_driver = {
        .id_table =     hwahc_id_table,
 };
 
-static int __init hwahc_driver_init(void)
-{
-       return usb_register(&hwahc_driver);
-}
-module_init(hwahc_driver_init);
-
-static void __exit hwahc_driver_exit(void)
-{
-       usb_deregister(&hwahc_driver);
-}
-module_exit(hwahc_driver_exit);
-
+module_usb_driver(hwahc_driver);
 
 MODULE_AUTHOR("Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>");
 MODULE_DESCRIPTION("Host Wired Adapter USB Host Control Driver");
index 27e209a7222fba7fcb6ab7cc7133554c4a47a94e..9c0f8caba3be5fd30d163ba4b50a016df742df62 100644 (file)
@@ -809,19 +809,7 @@ static void mts_usb_disconnect (struct usb_interface *intf)
        kfree(desc);
 }
 
-
-static int __init microtek_drv_init(void)
-{
-       return usb_register(&mts_usb_driver);
-}
-
-static void __exit microtek_drv_exit(void)
-{
-       usb_deregister(&mts_usb_driver);
-}
-
-module_init(microtek_drv_init);
-module_exit(microtek_drv_exit);
+module_usb_driver(mts_usb_driver);
 
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
index fe858711651cc16acf1b662a6ceb0de538e60e56..284b85461410a82129ed43d7082953d8cb81849e 100644 (file)
@@ -885,40 +885,7 @@ static struct usb_driver adu_driver = {
        .id_table = device_table,
 };
 
-static int __init adu_init(void)
-{
-       int result;
-
-       dbg(2," %s : enter", __func__);
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&adu_driver);
-       if (result < 0) {
-               printk(KERN_ERR "usb_register failed for the "__FILE__
-                      " driver. Error number %d\n", result);
-               goto exit;
-       }
-
-       printk(KERN_INFO "adutux " DRIVER_DESC " " DRIVER_VERSION "\n");
-       printk(KERN_INFO "adutux is an experimental driver. "
-              "Use at your own risk\n");
-
-exit:
-       dbg(2," %s : leave, return value %d", __func__, result);
-
-       return result;
-}
-
-static void __exit adu_exit(void)
-{
-       dbg(2," %s : enter", __func__);
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&adu_driver);
-       dbg(2," %s : leave", __func__);
-}
-
-module_init(adu_init);
-module_exit(adu_exit);
+module_usb_driver(adu_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 9251773ecef4ffae6102a29f356bad68cf7dd574..3f7c1a92579fbe8e10a5ac87d6abb0f2b7948086 100644 (file)
@@ -271,27 +271,7 @@ static struct usb_driver cypress_driver = {
        .id_table = cypress_table,
 };
 
-static int __init cypress_init(void)
-{
-       int result;
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&cypress_driver);
-       if (result)
-               printk(KERN_ERR KBUILD_MODNAME ": usb_register failed! "
-                      "Error number: %d\n", result);
-
-       return result;
-}
-
-static void __exit cypress_exit(void)
-{
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&cypress_driver);
-}
-
-module_init(cypress_init);
-module_exit(cypress_exit);
+module_usb_driver(cypress_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 1d7251bc1b5f5f395376ccf01f829c097d5ec82f..5b9831b95d97276feddb2f37a1d87e5205560a46 100644 (file)
@@ -417,31 +417,7 @@ static void cytherm_disconnect(struct usb_interface *interface)
        dev_info(&interface->dev, "Cypress thermometer now disconnected\n");
 }
 
-
-static int __init usb_cytherm_init(void)
-{
-       int result;
-
-       result = usb_register(&cytherm_driver);
-       if (result) {
-               printk(KERN_ERR KBUILD_MODNAME ": usb_register failed! "
-                      "Error number: %d\n", result);
-               return result;
-       }
-
-       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-              DRIVER_DESC "\n");
-       return 0;
-}
-
-static void __exit usb_cytherm_exit(void)
-{
-       usb_deregister(&cytherm_driver);
-}
-
-
-module_init (usb_cytherm_init);
-module_exit (usb_cytherm_exit);
+module_usb_driver(cytherm_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index a6521c95f683255597fb72f4c8a32a4b2bdfae82..d9b6a0355443c8457b16e3e660f7a0edb7324d25 100644 (file)
@@ -276,18 +276,7 @@ static struct usb_driver emi26_driver = {
        .id_table       = id_table,
 };
 
-static int __init emi26_init (void)
-{
-       return usb_register(&emi26_driver);
-}
-
-static void __exit emi26_exit (void)
-{
-       usb_deregister (&emi26_driver);
-}
-
-module_init(emi26_init);
-module_exit(emi26_exit);
+module_usb_driver(emi26_driver);
 
 MODULE_AUTHOR("Tapio Laxström");
 MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader.");
index fc15ad4c3139ca17432ced814bdc3204c559f56a..9f39062ebb080dfe57644fdcb52ea2e74542576d 100644 (file)
@@ -290,22 +290,7 @@ static struct usb_driver emi62_driver = {
        .id_table       = id_table,
 };
 
-static int __init emi62_init (void)
-{
-       int retval;
-       retval = usb_register (&emi62_driver);
-       if (retval)
-               printk(KERN_ERR "adi-emi: registration failed\n");
-       return retval;
-}
-
-static void __exit emi62_exit (void)
-{
-       usb_deregister (&emi62_driver);
-}
-
-module_init(emi62_init);
-module_exit(emi62_exit);
+module_usb_driver(emi62_driver);
 
 MODULE_AUTHOR("Tapio Laxström");
 MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader.");
index 515b67fffab10480f2d53235590a5091fc7cbe22..0dee24698504e5b82b77723e854ac212cefd5bd4 100644 (file)
@@ -428,29 +428,7 @@ static void idmouse_disconnect(struct usb_interface *interface)
        dev_info(&interface->dev, "disconnected\n");
 }
 
-static int __init usb_idmouse_init(void)
-{
-       int result;
-
-       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-              DRIVER_DESC "\n");
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&idmouse_driver);
-       if (result)
-               err("Unable to register device (error %d).", result);
-
-       return result;
-}
-
-static void __exit usb_idmouse_exit(void)
-{
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&idmouse_driver);
-}
-
-module_init(usb_idmouse_init);
-module_exit(usb_idmouse_exit);
+module_usb_driver(idmouse_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 81457904d6ba026481ebc2c734b0c8c790020fa8..7676b5b7e17130fa2f3faace93c89ca0ff541bce 100644 (file)
@@ -927,15 +927,4 @@ static struct usb_driver iowarrior_driver = {
        .id_table = iowarrior_ids,
 };
 
-static int __init iowarrior_init(void)
-{
-       return usb_register(&iowarrior_driver);
-}
-
-static void __exit iowarrior_exit(void)
-{
-       usb_deregister(&iowarrior_driver);
-}
-
-module_init(iowarrior_init);
-module_exit(iowarrior_exit);
+module_usb_driver(iowarrior_driver);
index fe1d44319d0a1eb2d373c14c6fccbfdfedd505c9..1dc7e9581cc6caf568f37b8befc1c8a62b9bac15 100644 (file)
@@ -126,18 +126,7 @@ static struct usb_driver isight_firmware_driver = {
        .id_table = id_table,
 };
 
-static int __init isight_firmware_init(void)
-{
-       return usb_register(&isight_firmware_driver);
-}
-
-static void __exit isight_firmware_exit(void)
-{
-       usb_deregister(&isight_firmware_driver);
-}
-
-module_init(isight_firmware_init);
-module_exit(isight_firmware_exit);
+module_usb_driver(isight_firmware_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
index 48c166f0d76420910b56ddb3b6f4fee35c8fcc14..5db4ab52061e49d837b7042ebf7f7d9d48d44457 100644 (file)
@@ -821,30 +821,5 @@ static struct usb_driver ld_usb_driver = {
        .id_table =     ld_usb_table,
 };
 
-/**
- *     ld_usb_init
- */
-static int __init ld_usb_init(void)
-{
-       int retval;
-
-       /* register this driver with the USB subsystem */
-       retval = usb_register(&ld_usb_driver);
-       if (retval)
-               err("usb_register failed for the %s driver. Error number %d\n", __FILE__, retval);
-
-       return retval;
-}
-
-/**
- *     ld_usb_exit
- */
-static void __exit ld_usb_exit(void)
-{
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&ld_usb_driver);
-}
-
-module_init(ld_usb_init);
-module_exit(ld_usb_exit);
+module_usb_driver(ld_usb_driver);
 
index a989356f693ec180edf9e737885388b929574d3c..16937da31cd88ba644081e43c08f989fcf7ce2a1 100644 (file)
@@ -1043,51 +1043,7 @@ static void tower_disconnect (struct usb_interface *interface)
        dbg(2, "%s: leave", __func__);
 }
 
-
-
-/**
- *     lego_usb_tower_init
- */
-static int __init lego_usb_tower_init(void)
-{
-       int result;
-       int retval = 0;
-
-       dbg(2, "%s: enter", __func__);
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&tower_driver);
-       if (result < 0) {
-               err("usb_register failed for the %s driver. Error number %d", __FILE__, result);
-               retval = -1;
-               goto exit;
-       }
-
-       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-              DRIVER_DESC "\n");
-
-exit:
-       dbg(2, "%s: leave, return value %d", __func__, retval);
-
-       return retval;
-}
-
-
-/**
- *     lego_usb_tower_exit
- */
-static void __exit lego_usb_tower_exit(void)
-{
-       dbg(2, "%s: enter", __func__);
-
-       /* deregister this driver with the USB subsystem */
-       usb_deregister (&tower_driver);
-
-       dbg(2, "%s: leave", __func__);
-}
-
-module_init (lego_usb_tower_init);
-module_exit (lego_usb_tower_exit);
+module_usb_driver(tower_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 4e23d3841b43df3a2ddd914181f6ccb581715c78..487a8ce0775e209288fdfea0637f1d54518a8d4f 100644 (file)
@@ -531,33 +531,7 @@ static struct usb_driver rio_driver = {
        .id_table =     rio_table,
 };
 
-static int __init usb_rio_init(void)
-{
-       int retval;
-       retval = usb_register(&rio_driver);
-       if (retval)
-               goto out;
-
-       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-              DRIVER_DESC "\n");
-
-out:
-       return retval;
-}
-
-
-static void __exit usb_rio_cleanup(void)
-{
-       struct rio_usb_data *rio = &rio_instance;
-
-       rio->present = 0;
-       usb_deregister(&rio_driver);
-
-
-}
-
-module_init(usb_rio_init);
-module_exit(usb_rio_cleanup);
+module_usb_driver(rio_driver);
 
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
index f63776a48e2a8717f37d5ebf68cb6b408a5d895a..741efed4a2366407abfb0229ab9b65a3c906960b 100644 (file)
@@ -137,26 +137,7 @@ static struct usb_driver tv_driver = {
        .id_table =     id_table,
 };
 
-static int __init tv_init(void)
-{
-       int retval = usb_register(&tv_driver);
-       if (retval) {
-               err("usb_register failed. Error number %d", retval);
-               return retval;
-       }
-
-       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-              DRIVER_DESC "\n");
-       return 0;
-}
-
-static void __exit tv_exit(void)
-{
-       usb_deregister(&tv_driver);
-}
-
-module_init (tv_init);
-module_exit (tv_exit);
+module_usb_driver(tv_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 1871cdf10da3fe9ff4926a8df457e8e17f4b7775..e2b4bd31c2b662bd834d44428c8431ed73d1857b 100644 (file)
@@ -450,25 +450,7 @@ static struct usb_driver lcd_driver = {
        .supports_autosuspend = 1,
 };
 
-static int __init usb_lcd_init(void)
-{
-       int result;
-
-       result = usb_register(&lcd_driver);
-       if (result)
-               err("usb_register failed. Error number %d", result);
-
-       return result;
-}
-
-
-static void __exit usb_lcd_exit(void)
-{
-       usb_deregister(&lcd_driver);
-}
-
-module_init(usb_lcd_init);
-module_exit(usb_lcd_exit);
+module_usb_driver(lcd_driver);
 
 MODULE_AUTHOR("Georges Toth <g.toth@e-biz.lu>");
 MODULE_DESCRIPTION(DRIVER_VERSION);
index 43f84e50d514bc4667b93e52f807a7448c305e10..4af56fbc3c0691ccc243f05de359f838a9f8528f 100644 (file)
@@ -231,23 +231,7 @@ static struct usb_driver led_driver = {
        .id_table =     id_table,
 };
 
-static int __init usb_led_init(void)
-{
-       int retval = 0;
-
-       retval = usb_register(&led_driver);
-       if (retval)
-               err("usb_register failed. Error number %d", retval);
-       return retval;
-}
-
-static void __exit usb_led_exit(void)
-{
-       usb_deregister(&led_driver);
-}
-
-module_init(usb_led_init);
-module_exit(usb_led_exit);
+module_usb_driver(led_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index 417b8f207e8b126ac5b2ee33bab0dc5fdaa232b0..107bf13b1cf14e64619a081b3f28c4d6f67ae94d 100644 (file)
@@ -437,23 +437,7 @@ static struct usb_driver sevseg_driver = {
        .supports_autosuspend = 1,
 };
 
-static int __init usb_sevseg_init(void)
-{
-       int rc = 0;
-
-       rc = usb_register(&sevseg_driver);
-       if (rc)
-               err("usb_register failed. Error number %d", rc);
-       return rc;
-}
-
-static void __exit usb_sevseg_exit(void)
-{
-       usb_deregister(&sevseg_driver);
-}
-
-module_init(usb_sevseg_init);
-module_exit(usb_sevseg_exit);
+module_usb_driver(sevseg_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
index ac5bfd619e62ab4dad5d05772ece6fcc13744159..897edda422709c016b36d469b5930532a104a30c 100644 (file)
@@ -539,26 +539,6 @@ static const struct file_operations yurex_fops = {
        .llseek =       default_llseek,
 };
 
-
-static int __init usb_yurex_init(void)
-{
-       int result;
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&yurex_driver);
-       if (result)
-               err("usb_register failed. Error number %d", result);
-
-       return result;
-}
-
-static void __exit usb_yurex_exit(void)
-{
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&yurex_driver);
-}
-
-module_init(usb_yurex_init);
-module_exit(usb_yurex_exit);
+module_usb_driver(yurex_driver);
 
 MODULE_LICENSE("GPL");
index 42d0eaed4a0133282678792d9d74bd7ebc4045a7..3ca87a823342de7287fd6c8ca7a0ee9c7a3bab5b 100644 (file)
@@ -1278,15 +1278,4 @@ static struct usb_driver alauda_driver = {
        .soft_unbind =  1,
 };
 
-static int __init alauda_init(void)
-{
-       return usb_register(&alauda_driver);
-}
-
-static void __exit alauda_exit(void)
-{
-       usb_deregister(&alauda_driver);
-}
-
-module_init(alauda_init);
-module_exit(alauda_exit);
+module_usb_driver(alauda_driver);
index c8447182118374b62ef78f5bcf1b27c26b41a5f9..c7909dfa243449d871b7dc519a61fc14b1468efb 100644 (file)
@@ -274,15 +274,4 @@ static struct usb_driver cypress_driver = {
        .soft_unbind =  1,
 };
 
-static int __init cypress_init(void)
-{
-       return usb_register(&cypress_driver);
-}
-
-static void __exit cypress_exit(void)
-{
-       usb_deregister(&cypress_driver);
-}
-
-module_init(cypress_init);
-module_exit(cypress_exit);
+module_usb_driver(cypress_driver);
index ded836b02d7b87f03e507c6806f3d215f59e754f..a99be857b7942260d329df8534376363d4cd0699 100644 (file)
@@ -753,15 +753,4 @@ static struct usb_driver datafab_driver = {
        .soft_unbind =  1,
 };
 
-static int __init datafab_init(void)
-{
-       return usb_register(&datafab_driver);
-}
-
-static void __exit datafab_exit(void)
-{
-       usb_deregister(&datafab_driver);
-}
-
-module_init(datafab_init);
-module_exit(datafab_exit);
+module_usb_driver(datafab_driver);
index 4dca3ef0668c9963448289c3ab1160633865a6b9..5929f49d0b434a89ff70b3de1f30f46816d8ca7b 100644 (file)
@@ -2410,15 +2410,4 @@ static struct usb_driver ene_ub6250_driver = {
        .soft_unbind =  1,
 };
 
-static int __init ene_ub6250_init(void)
-{
-       return usb_register(&ene_ub6250_driver);
-}
-
-static void __exit ene_ub6250_exit(void)
-{
-       usb_deregister(&ene_ub6250_driver);
-}
-
-module_init(ene_ub6250_init);
-module_exit(ene_ub6250_exit);
+module_usb_driver(ene_ub6250_driver);
index 6542ca40d505632481355756633d0f7dbf81a6b7..03d4a873748c9278fd819b16b88a85dc405b66c1 100644 (file)
@@ -555,15 +555,4 @@ static struct usb_driver freecom_driver = {
        .soft_unbind =  1,
 };
 
-static int __init freecom_init(void)
-{
-       return usb_register(&freecom_driver);
-}
-
-static void __exit freecom_exit(void)
-{
-       usb_deregister(&freecom_driver);
-}
-
-module_init(freecom_init);
-module_exit(freecom_exit);
+module_usb_driver(freecom_driver);
index ffc4193e9505fbaac69afcc4c6fa42a21e8dbab7..6d6923317f10c49591081fb6f2f3f8696aac3b38 100644 (file)
@@ -1568,15 +1568,4 @@ static struct usb_driver isd200_driver = {
        .soft_unbind =  1,
 };
 
-static int __init isd200_init(void)
-{
-       return usb_register(&isd200_driver);
-}
-
-static void __exit isd200_exit(void)
-{
-       usb_deregister(&isd200_driver);
-}
-
-module_init(isd200_init);
-module_exit(isd200_exit);
+module_usb_driver(isd200_driver);
index 6168596c5ac68eccc72b6bacf1a42770df8a12c5..54b71650b69c9d0a796523176ecdc4054d232a56 100644 (file)
@@ -679,15 +679,4 @@ static struct usb_driver jumpshot_driver = {
        .soft_unbind =  1,
 };
 
-static int __init jumpshot_init(void)
-{
-       return usb_register(&jumpshot_driver);
-}
-
-static void __exit jumpshot_exit(void)
-{
-       usb_deregister(&jumpshot_driver);
-}
-
-module_init(jumpshot_init);
-module_exit(jumpshot_exit);
+module_usb_driver(jumpshot_driver);
index ba1b789068802c138549e96542fa18a7dac8952d..35181e29124d13b051fab6cd9bb90b95a62e8d3b 100644 (file)
@@ -232,15 +232,4 @@ static struct usb_driver karma_driver = {
        .soft_unbind =  1,
 };
 
-static int __init karma_init(void)
-{
-       return usb_register(&karma_driver);
-}
-
-static void __exit karma_exit(void)
-{
-       usb_deregister(&karma_driver);
-}
-
-module_init(karma_init);
-module_exit(karma_exit);
+module_usb_driver(karma_driver);
index 1943be5a2914217e6e3ff8ed0b2f1b706a424315..721c8c587305825759ee4fb75260811407b7ccda 100644 (file)
@@ -314,15 +314,4 @@ static struct usb_driver onetouch_driver = {
        .soft_unbind =  1,
 };
 
-static int __init onetouch_init(void)
-{
-       return usb_register(&onetouch_driver);
-}
-
-static void __exit onetouch_exit(void)
-{
-       usb_deregister(&onetouch_driver);
-}
-
-module_init(onetouch_init);
-module_exit(onetouch_exit);
+module_usb_driver(onetouch_driver);
index 0ce5f79197e7d4a83ccbac6991f6e4603ee9a029..c41cd30d2c0112054522a51886d5af19339293a5 100644 (file)
@@ -1104,15 +1104,4 @@ static struct usb_driver realtek_cr_driver = {
        .supports_autosuspend = 1,
 };
 
-static int __init realtek_cr_init(void)
-{
-       return usb_register(&realtek_cr_driver);
-}
-
-static void __exit realtek_cr_exit(void)
-{
-       usb_deregister(&realtek_cr_driver);
-}
-
-module_init(realtek_cr_init);
-module_exit(realtek_cr_exit);
+module_usb_driver(realtek_cr_driver);
index bcb9a709d349b8e0175b3fd5f3fc01446e095061..83ee49e737bd50a1b2c69496f76a1f9ebceebf59 100644 (file)
@@ -1789,15 +1789,4 @@ static struct usb_driver sddr09_driver = {
        .soft_unbind =  1,
 };
 
-static int __init sddr09_init(void)
-{
-       return usb_register(&sddr09_driver);
-}
-
-static void __exit sddr09_exit(void)
-{
-       usb_deregister(&sddr09_driver);
-}
-
-module_init(sddr09_init);
-module_exit(sddr09_exit);
+module_usb_driver(sddr09_driver);
index 44dfed7754edb0444763b045229d4f32465812ab..8983ec2ffb5ac02e592f4d278d5c25fb696f62ec 100644 (file)
@@ -1008,15 +1008,4 @@ static struct usb_driver sddr55_driver = {
        .soft_unbind =  1,
 };
 
-static int __init sddr55_init(void)
-{
-       return usb_register(&sddr55_driver);
-}
-
-static void __exit sddr55_exit(void)
-{
-       usb_deregister(&sddr55_driver);
-}
-
-module_init(sddr55_init);
-module_exit(sddr55_exit);
+module_usb_driver(sddr55_driver);
index 0b00091d2ae914b252abd1d397639b181de9510e..a4c02751af4e65f7a1928dbb8b0a280fa0116848 100644 (file)
@@ -1865,15 +1865,4 @@ static struct usb_driver usbat_driver = {
        .soft_unbind =  1,
 };
 
-static int __init usbat_init(void)
-{
-       return usb_register(&usbat_driver);
-}
-
-static void __exit usbat_exit(void)
-{
-       usb_deregister(&usbat_driver);
-}
-
-module_init(usbat_init);
-module_exit(usbat_exit);
+module_usb_driver(usbat_driver);
index 1d10d5b8204c641289a0150649ea7bf694c53ae2..a33ead5dce2045d2abc18779c05c26b20a339bc0 100644 (file)
@@ -760,18 +760,7 @@ static struct usb_driver uas_driver = {
        .id_table = uas_usb_ids,
 };
 
-static int uas_init(void)
-{
-       return usb_register(&uas_driver);
-}
-
-static void uas_exit(void)
-{
-       usb_deregister(&uas_driver);
-}
-
-module_init(uas_init);
-module_exit(uas_exit);
+module_usb_driver(uas_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Matthew Wilcox and Sarah Sharp");
index 32d6fc9539042ad0c97b2d458ade68ce0188de9d..5c6c1bdbd455d584fc06160ab2ff78240641bcfd 100644 (file)
@@ -688,25 +688,6 @@ static struct usb_driver skel_driver = {
        .supports_autosuspend = 1,
 };
 
-static int __init usb_skel_init(void)
-{
-       int result;
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&skel_driver);
-       if (result)
-               err("usb_register failed. Error number %d", result);
-
-       return result;
-}
-
-static void __exit usb_skel_exit(void)
-{
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&skel_driver);
-}
-
-module_init(usb_skel_init);
-module_exit(usb_skel_exit);
+module_usb_driver(skel_driver);
 
 MODULE_LICENSE("GPL");
index 200fd7c6c7d5e5de6a0ee6e34c0d2879c2809141..7f78f300f8fbe02674aa7f1f0846d8399c3be0f8 100644 (file)
@@ -655,17 +655,7 @@ static struct usb_driver cbaf_driver = {
        .disconnect =   cbaf_disconnect,
 };
 
-static int __init cbaf_driver_init(void)
-{
-       return usb_register(&cbaf_driver);
-}
-module_init(cbaf_driver_init);
-
-static void __exit cbaf_driver_exit(void)
-{
-       usb_deregister(&cbaf_driver);
-}
-module_exit(cbaf_driver_exit);
+module_usb_driver(cbaf_driver);
 
 MODULE_AUTHOR("Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>");
 MODULE_DESCRIPTION("Wireless USB Cable Based Association");