patch-2.3.48 linux/drivers/usb/acm.c

Next file: linux/drivers/usb/devio.c
Previous file: linux/drivers/sound/wavfront.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.47/linux/drivers/usb/acm.c linux/drivers/usb/acm.c
@@ -643,16 +643,10 @@
 };
 
 /*
- * Init / cleanup.
+ * Init / exit.
  */
 
-static void __exit usb_acm_cleanup(void)
-{
-	usb_deregister(&acm_driver);
-	tty_unregister_driver(&acm_tty_driver);
-}
-
-static int __init usb_acm_init(void)
+static int __init acm_init(void)
 {
 	acm_tty_driver.init_termios =		tty_std_termios;
 	acm_tty_driver.init_termios.c_cflag =	B9600 | CS8 | CREAD | HUPCL | CLOCAL;
@@ -668,5 +662,11 @@
 	return 0;
 }
 
-module_init(usb_acm_init);
-module_exit(usb_acm_cleanup);
+static void __exit acm_exit(void)
+{
+	usb_deregister(&acm_driver);
+	tty_unregister_driver(&acm_tty_driver);
+}
+
+module_init(acm_init);
+module_exit(acm_exit);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)