diff options
author | Johannes Hölzl <johannes.hoelzl@gmx.de> | 2006-12-17 15:50:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:44:34 -0500 |
commit | d9b1b787736852f462dbf277b3ca708cbbf693ae (patch) | |
tree | 143d154a3f77bb3aff27fb74eed339f2713ed399 /drivers/usb/serial/io_tables.h | |
parent | 93bacefc4cc0b53e1cb6a336d43847154fdf6886 (diff) |
USB serial: add driver pointer to all usb-serial drivers
Every usb serial driver should have a pointer to the corresponding usb driver.
So the usb serial core can add a new id not only to the usb serial driver, but
also to the usb driver.
Also the usb drivers of ark3116, mos7720 and mos7840 missed the flag
no_dynamic_id=1. This is added now.
Signed-off-by: Johannes Hölzl <johannes.hoelzl@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/io_tables.h')
-rw-r--r-- | drivers/usb/serial/io_tables.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h index 3cbb8c19d925..6d3008772540 100644 --- a/drivers/usb/serial/io_tables.h +++ b/drivers/usb/serial/io_tables.h | |||
@@ -95,12 +95,21 @@ static struct usb_device_id id_table_combined [] = { | |||
95 | 95 | ||
96 | MODULE_DEVICE_TABLE (usb, id_table_combined); | 96 | MODULE_DEVICE_TABLE (usb, id_table_combined); |
97 | 97 | ||
98 | static struct usb_driver io_driver = { | ||
99 | .name = "io_edgeport", | ||
100 | .probe = usb_serial_probe, | ||
101 | .disconnect = usb_serial_disconnect, | ||
102 | .id_table = id_table_combined, | ||
103 | .no_dynamic_id = 1, | ||
104 | }; | ||
105 | |||
98 | static struct usb_serial_driver edgeport_2port_device = { | 106 | static struct usb_serial_driver edgeport_2port_device = { |
99 | .driver = { | 107 | .driver = { |
100 | .owner = THIS_MODULE, | 108 | .owner = THIS_MODULE, |
101 | .name = "edgeport_2", | 109 | .name = "edgeport_2", |
102 | }, | 110 | }, |
103 | .description = "Edgeport 2 port adapter", | 111 | .description = "Edgeport 2 port adapter", |
112 | .usb_driver = &io_driver, | ||
104 | .id_table = edgeport_2port_id_table, | 113 | .id_table = edgeport_2port_id_table, |
105 | .num_interrupt_in = 1, | 114 | .num_interrupt_in = 1, |
106 | .num_bulk_in = 1, | 115 | .num_bulk_in = 1, |
@@ -131,6 +140,7 @@ static struct usb_serial_driver edgeport_4port_device = { | |||
131 | .name = "edgeport_4", | 140 | .name = "edgeport_4", |
132 | }, | 141 | }, |
133 | .description = "Edgeport 4 port adapter", | 142 | .description = "Edgeport 4 port adapter", |
143 | .usb_driver = &io_driver, | ||
134 | .id_table = edgeport_4port_id_table, | 144 | .id_table = edgeport_4port_id_table, |
135 | .num_interrupt_in = 1, | 145 | .num_interrupt_in = 1, |
136 | .num_bulk_in = 1, | 146 | .num_bulk_in = 1, |
@@ -161,6 +171,7 @@ static struct usb_serial_driver edgeport_8port_device = { | |||
161 | .name = "edgeport_8", | 171 | .name = "edgeport_8", |
162 | }, | 172 | }, |
163 | .description = "Edgeport 8 port adapter", | 173 | .description = "Edgeport 8 port adapter", |
174 | .usb_driver = &io_driver, | ||
164 | .id_table = edgeport_8port_id_table, | 175 | .id_table = edgeport_8port_id_table, |
165 | .num_interrupt_in = 1, | 176 | .num_interrupt_in = 1, |
166 | .num_bulk_in = 1, | 177 | .num_bulk_in = 1, |