---

yaml --- r: 289662 b: refs/heads/master c: 1935e35 h: refs/heads/master v: v3
git-mirror · Mar 8, 2012 · dde5ce5 · dde5ce5
1 parent 4ce01d3
commit dde5ce5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 45 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdac0f647a2cf12e7152dc1d94dd08a1af4a2a82
+refs/heads/master: 1935e357bb2a3031772730293a3725e3cca07778
diff --git a/trunk/drivers/usb/serial/metro-usb.c b/trunk/drivers/usb/serial/metro-usb.c
@@ -151,47 +151,6 @@ static void metrousb_close (struct usb_serial_port *port)
 	metrousb_cleanup(port);
 }
 
-/* ----------------------------------------------------------------------------------------------
-  Description:
-	Driver exit.
-
-  Input:
-	None:
-
-  Output:
-	None:
-*/
-static void __exit metrousb_exit(void)
-{
-	usb_serial_deregister_drivers(&metrousb_driver, serial_drivers);
-}
-
-/* ----------------------------------------------------------------------------------------------
-  Description:
-	Driver initialization.
-
-  Input:
-	None:
-
-  Output:
-	int: Returns true (0) if successful, false otherwise.
-*/
-static int __init metrousb_init(void)
-{
-	int retval = 0;
-
-	dbg("METRO-USB - %s", __FUNCTION__);
-
-	/* Register the devices. */
-	retval = usb_serial_register_drivers(&metrousb_driver, serial_drivers);
-	if (retval)
-		return retval;
-
-	printk(KERN_INFO DRIVER_DESC " : " DRIVER_VERSION);
-
-	return retval;
-}
-
 /* ----------------------------------------------------------------------------------------------
   Description:
 	Open the drivers serial port.
@@ -574,9 +533,8 @@ static void metrousb_unthrottle (struct tty_struct *tty)
 	}
 }
 
-/* Standard module function. */
-module_init(metrousb_init);
-module_exit(metrousb_exit);
+module_usb_serial_driver(metrousb_driver, serial_drivers);
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR( "Philip Nicastro" );
 MODULE_AUTHOR( "Aleksey Babahin <tamerlan311@gmail.com>" );