aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-28 16:12:19 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-28 16:12:19 -0500
commit9334c4c16e6fa80dc55865897337b49c1753f33b (patch)
tree3aed87e74fa64b21ae2972ae751120235e7175a8 /drivers
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>
Diffstat (limited to 'drivers')
-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 ab5047944d1d..005511b2ee08 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1289,25 +1289,7 @@ struct option_port_private {
1289 unsigned long tx_start_time[N_OUT_URB]; 1289 unsigned long tx_start_time[N_OUT_URB];
1290}; 1290};
1291 1291
1292/* Functions used by new usb-serial code. */ 1292module_usb_serial_driver(option_driver, serial_drivers);
1293static int __init option_init(void)
1294{
1295 int retval;
1296
1297 retval = usb_serial_register_drivers(&option_driver, serial_drivers);
1298 if (retval == 0)
1299 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
1300 DRIVER_DESC "\n");
1301 return retval;
1302}
1303
1304static void __exit option_exit(void)
1305{
1306 usb_serial_deregister_drivers(&option_driver, serial_drivers);
1307}
1308
1309module_init(option_init);
1310module_exit(option_exit);
1311 1293
1312static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason, 1294static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,
1313 const struct option_blacklist_info *blacklist) 1295 const struct option_blacklist_info *blacklist)