From 5671df5c1c6ee664ebc66a5be60a282afee8d340 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Feb 2012 13:11:40 -0800 Subject: [PATCH] USB: serial: cyberjack.c: use module_usb_serial_driver This converts the cyberjack.c driver to use the module_usb_serial_driver() call instead of having to have a module_init/module_exit function, saving a lot of duplicated code. CC: Matthias Bruestle and Harald Welte Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/cyberjack.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index d2e536f649ba..d39b9418f2fb 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c @@ -475,26 +475,7 @@ exit: usb_serial_port_softint(port); } -static int __init cyberjack_init(void) -{ - int retval; - - retval = usb_serial_register_drivers(&cyberjack_driver, serial_drivers); - if (retval == 0) { - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " " - DRIVER_AUTHOR "\n"); - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n"); - } - return retval; -} - -static void __exit cyberjack_exit(void) -{ - usb_serial_deregister_drivers(&cyberjack_driver, serial_drivers); -} - -module_init(cyberjack_init); -module_exit(cyberjack_exit); +module_usb_serial_driver(cyberjack_driver, serial_drivers); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC);