Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / drivers / staging / frontier / tranzport.c

diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index 0e7b4d6bb80765d2613ee053200caed287c30f7f..cf47a5d191fcd72df627907c7ce02e52e5f87195 100644 (file)
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -971,29 +971,4 @@ static struct usb_driver usb_tranzport_driver = {
        .id_table = usb_tranzport_table,
 };
 
-/**
- *     usb_tranzport_init
- */
-static int __init usb_tranzport_init(void)
-{
-       int retval;
-
-       /* register this driver with the USB subsystem */
-       retval = usb_register(&usb_tranzport_driver);
-       if (retval)
-               err("usb_register failed for the " __FILE__
-                       " driver. Error number %d\n", retval);
-       return retval;
-}
-/**
- *     usb_tranzport_exit
- */
-
-static void __exit usb_tranzport_exit(void)
-{
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&usb_tranzport_driver);
-}
-
-module_init(usb_tranzport_init);
-module_exit(usb_tranzport_exit);
+module_usb_driver(usb_tranzport_driver);