diff options
Diffstat (limited to 'drivers/usb/serial/zio.c')
-rw-r--r-- | drivers/usb/serial/zio.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/drivers/usb/serial/zio.c b/drivers/usb/serial/zio.c index f57967278833..9d0bb3752cd4 100644 --- a/drivers/usb/serial/zio.c +++ b/drivers/usb/serial/zio.c | |||
@@ -27,7 +27,6 @@ static struct usb_driver zio_driver = { | |||
27 | .probe = usb_serial_probe, | 27 | .probe = usb_serial_probe, |
28 | .disconnect = usb_serial_disconnect, | 28 | .disconnect = usb_serial_disconnect, |
29 | .id_table = id_table, | 29 | .id_table = id_table, |
30 | .no_dynamic_id = 1, | ||
31 | }; | 30 | }; |
32 | 31 | ||
33 | static struct usb_serial_driver zio_device = { | 32 | static struct usb_serial_driver zio_device = { |
@@ -36,29 +35,12 @@ static struct usb_serial_driver zio_device = { | |||
36 | .name = "zio", | 35 | .name = "zio", |
37 | }, | 36 | }, |
38 | .id_table = id_table, | 37 | .id_table = id_table, |
39 | .usb_driver = &zio_driver, | ||
40 | .num_ports = 1, | 38 | .num_ports = 1, |
41 | }; | 39 | }; |
42 | 40 | ||
43 | static int __init zio_init(void) | 41 | static struct usb_serial_driver * const serial_drivers[] = { |
44 | { | 42 | &zio_device, NULL |
45 | int retval; | 43 | }; |
46 | |||
47 | retval = usb_serial_register(&zio_device); | ||
48 | if (retval) | ||
49 | return retval; | ||
50 | retval = usb_register(&zio_driver); | ||
51 | if (retval) | ||
52 | usb_serial_deregister(&zio_device); | ||
53 | return retval; | ||
54 | } | ||
55 | |||
56 | static void __exit zio_exit(void) | ||
57 | { | ||
58 | usb_deregister(&zio_driver); | ||
59 | usb_serial_deregister(&zio_device); | ||
60 | } | ||
61 | 44 | ||
62 | module_init(zio_init); | 45 | module_usb_serial_driver(zio_driver, serial_drivers); |
63 | module_exit(zio_exit); | ||
64 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |