1 files changed, 1 insertions, 47 deletions

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 4cc36c761801..a39ddd1b0dca 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -130,53 +130,7 @@ struct keyspan_port_private {
 #include "keyspan_usa67msg.h"
 
 
-/* Functions used by new usb-serial code. */
-static int __init keyspan_init(void)
-{
-        int retval;
-        retval = usb_serial_register(&keyspan_pre_device);
-        if (retval)
-                goto failed_pre_device_register;
-        retval = usb_serial_register(&keyspan_1port_device);
-        if (retval)
-                goto failed_1port_device_register;
-        retval = usb_serial_register(&keyspan_2port_device);
-        if (retval)
-                goto failed_2port_device_register;
-        retval = usb_serial_register(&keyspan_4port_device);
-        if (retval)
-                goto failed_4port_device_register;
-        retval = usb_register(&keyspan_driver);
-        if (retval)
-                goto failed_usb_register;
-
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-
-        return 0;
-failed_usb_register:
-        usb_serial_deregister(&keyspan_4port_device);
-failed_4port_device_register:
-        usb_serial_deregister(&keyspan_2port_device);
-failed_2port_device_register:
-        usb_serial_deregister(&keyspan_1port_device);
-failed_1port_device_register:
-        usb_serial_deregister(&keyspan_pre_device);
-failed_pre_device_register:
-        return retval;
-}
-
-static void __exit keyspan_exit(void)
-{
-        usb_deregister(&keyspan_driver);
-        usb_serial_deregister(&keyspan_pre_device);
-        usb_serial_deregister(&keyspan_1port_device);
-        usb_serial_deregister(&keyspan_2port_device);
-        usb_serial_deregister(&keyspan_4port_device);
-}
-
-module_init(keyspan_init);
-module_exit(keyspan_exit);
+module_usb_serial_driver(keyspan_driver, serial_drivers);
 
 static void keyspan_break_ctl(struct tty_struct *tty, int break_state)
 {