summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-28 13:12:19 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-28 13:12:19 -0800
commit9334c4c16e6fa80dc55865897337b49c1753f33b (patch)
tree3aed87e74fa64b21ae2972ae751120235e7175a8
parente206b7f831da365a38b22f72ba42db288db71c65 (diff)
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 <smurf@smurf.noris.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/option.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index ab5047944d1..005511b2ee0 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)