diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2012-02-23 14:56:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 15:39:18 -0500 |
commit | 7dbe2460989b10644651e779b17b683627feea48 (patch) | |
tree | 51ab97a04dfdcea7e71cbc5e8953efab69714b90 /drivers/usb/serial/io_tables.h | |
parent | 97b6b6d2339f67eb17d954930a908b762af66228 (diff) |
usb-serial: use new registration API in [i-j]* drivers
This patch (as1525) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:
io_edgeport, io_ti, ipaq, ipw, ir-usb, and iuu_phoenix.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/io_tables.h')
-rw-r--r-- | drivers/usb/serial/io_tables.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h index 178b22eb32b1..d0e7c9affb6f 100644 --- a/drivers/usb/serial/io_tables.h +++ b/drivers/usb/serial/io_tables.h | |||
@@ -100,7 +100,6 @@ static struct usb_driver io_driver = { | |||
100 | .probe = usb_serial_probe, | 100 | .probe = usb_serial_probe, |
101 | .disconnect = usb_serial_disconnect, | 101 | .disconnect = usb_serial_disconnect, |
102 | .id_table = id_table_combined, | 102 | .id_table = id_table_combined, |
103 | .no_dynamic_id = 1, | ||
104 | }; | 103 | }; |
105 | 104 | ||
106 | static struct usb_serial_driver edgeport_2port_device = { | 105 | static struct usb_serial_driver edgeport_2port_device = { |
@@ -109,7 +108,6 @@ static struct usb_serial_driver edgeport_2port_device = { | |||
109 | .name = "edgeport_2", | 108 | .name = "edgeport_2", |
110 | }, | 109 | }, |
111 | .description = "Edgeport 2 port adapter", | 110 | .description = "Edgeport 2 port adapter", |
112 | .usb_driver = &io_driver, | ||
113 | .id_table = edgeport_2port_id_table, | 111 | .id_table = edgeport_2port_id_table, |
114 | .num_ports = 2, | 112 | .num_ports = 2, |
115 | .open = edge_open, | 113 | .open = edge_open, |
@@ -139,7 +137,6 @@ static struct usb_serial_driver edgeport_4port_device = { | |||
139 | .name = "edgeport_4", | 137 | .name = "edgeport_4", |
140 | }, | 138 | }, |
141 | .description = "Edgeport 4 port adapter", | 139 | .description = "Edgeport 4 port adapter", |
142 | .usb_driver = &io_driver, | ||
143 | .id_table = edgeport_4port_id_table, | 140 | .id_table = edgeport_4port_id_table, |
144 | .num_ports = 4, | 141 | .num_ports = 4, |
145 | .open = edge_open, | 142 | .open = edge_open, |
@@ -169,7 +166,6 @@ static struct usb_serial_driver edgeport_8port_device = { | |||
169 | .name = "edgeport_8", | 166 | .name = "edgeport_8", |
170 | }, | 167 | }, |
171 | .description = "Edgeport 8 port adapter", | 168 | .description = "Edgeport 8 port adapter", |
172 | .usb_driver = &io_driver, | ||
173 | .id_table = edgeport_8port_id_table, | 169 | .id_table = edgeport_8port_id_table, |
174 | .num_ports = 8, | 170 | .num_ports = 8, |
175 | .open = edge_open, | 171 | .open = edge_open, |
@@ -199,7 +195,6 @@ static struct usb_serial_driver epic_device = { | |||
199 | .name = "epic", | 195 | .name = "epic", |
200 | }, | 196 | }, |
201 | .description = "EPiC device", | 197 | .description = "EPiC device", |
202 | .usb_driver = &io_driver, | ||
203 | .id_table = Epic_port_id_table, | 198 | .id_table = Epic_port_id_table, |
204 | .num_ports = 1, | 199 | .num_ports = 1, |
205 | .open = edge_open, | 200 | .open = edge_open, |
@@ -223,5 +218,10 @@ static struct usb_serial_driver epic_device = { | |||
223 | .write_bulk_callback = edge_bulk_out_data_callback, | 218 | .write_bulk_callback = edge_bulk_out_data_callback, |
224 | }; | 219 | }; |
225 | 220 | ||
221 | static struct usb_serial_driver * const serial_drivers[] = { | ||
222 | &edgeport_2port_device, &edgeport_4port_device, | ||
223 | &edgeport_8port_device, &epic_device, NULL | ||
224 | }; | ||
225 | |||
226 | #endif | 226 | #endif |
227 | 227 | ||