diff --git a/[refs] b/[refs] index 5a922b2ddc7c..b85902b2419d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1cddb4a8e9b09c33158acae05c48069d74fa4d0 +refs/heads/master: f136e8b61c205fa6dccdc45fbda372f3acb2b5ab diff --git a/trunk/drivers/staging/quatech_usb2/quatech_usb2.c b/trunk/drivers/staging/quatech_usb2/quatech_usb2.c index b8a078abd6c7..bb977e00cc86 100644 --- a/trunk/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/trunk/drivers/staging/quatech_usb2/quatech_usb2.c @@ -1966,27 +1966,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &quatech2_device, NULL }; -static int __init quausb2_usb_init(void) -{ - int retval; - - dbg("%s\n", __func__); - - retval = usb_serial_register_drivers(&quausb2_usb_driver, - serial_drivers); - if (retval == 0) - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return retval; -} - -static void __exit quausb2_usb_exit(void) -{ - usb_serial_deregister_drivers(&quausb2_usb_driver, serial_drivers); -} - -module_init(quausb2_usb_init); -module_exit(quausb2_usb_exit); +module_usb_serial_driver(quausb2_usb_driver, serial_drivers); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC);