diff options
Diffstat (limited to 'drivers/usb/serial/hp4x.c')
| -rw-r--r-- | drivers/usb/serial/hp4x.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c index 809379159b0e..325cf092b61c 100644 --- a/drivers/usb/serial/hp4x.c +++ b/drivers/usb/serial/hp4x.c @@ -41,7 +41,6 @@ static struct usb_driver hp49gp_driver = { .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, - .no_dynamic_id = 1, }; static struct usb_serial_driver hp49gp_device = { @@ -50,32 +49,27 @@ static struct usb_serial_driver hp49gp_device = { .name = "hp4X", }, .id_table = id_table, - .usb_driver = &hp49gp_driver, .num_ports = 1, }; +static struct usb_serial_driver * const serial_drivers[] = { + &hp49gp_device, NULL +}; + static int __init hp49gp_init(void) { int retval; - retval = usb_serial_register(&hp49gp_device); - if (retval) - goto failed_usb_serial_register; - retval = usb_register(&hp49gp_driver); - if (retval) - goto failed_usb_register; - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return 0; -failed_usb_register: - usb_serial_deregister(&hp49gp_device); -failed_usb_serial_register: + + retval = usb_serial_register_drivers(&hp49gp_driver, serial_drivers); + if (retval == 0) + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" + DRIVER_DESC "\n"); return retval; } static void __exit hp49gp_exit(void) { - usb_deregister(&hp49gp_driver); - usb_serial_deregister(&hp49gp_device); + usb_serial_deregister_drivers(&hp49gp_driver, serial_drivers); } module_init(hp49gp_init); |
