From: Greg Kroah-Hartman Date: Tue, 28 Feb 2012 21:12:19 +0000 (-0800) Subject: USB: serial: option.c: use module_usb_serial_driver X-Git-Tag: MMI-PSA29.97-13-9~17266^2~22^2~56 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9334c4c16e6fa80dc55865897337b49c1753f33b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git USB: serial: option.c: use module_usb_serial_driver This converts the option.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 Urlichs Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index ab5047944d1d..005511b2ee08 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -1289,25 +1289,7 @@ struct option_port_private { unsigned long tx_start_time[N_OUT_URB]; }; -/* Functions used by new usb-serial code. */ -static int __init option_init(void) -{ - int retval; - - retval = usb_serial_register_drivers(&option_driver, serial_drivers); - if (retval == 0) - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return retval; -} - -static void __exit option_exit(void) -{ - usb_serial_deregister_drivers(&option_driver, serial_drivers); -} - -module_init(option_init); -module_exit(option_exit); +module_usb_serial_driver(option_driver, serial_drivers); static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason, const struct option_blacklist_info *blacklist)