aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-03-20 15:08:22 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-20 15:08:22 -0500
commit91bca4b3e2f1aaaf67e62a36914f33ca1e7d5a06 (patch)
tree0a8c96881a7323ad1e430409b28728a72ea40972 /drivers
parentd358788f3f30113e49882187d794832905e42592 (diff)
[SERIAL] Merge avlab serial board entries in parport_serial
As can be seen from this patch, the avlab_*_[68]50 table entries are identical to the plain avlab_* entries in every respect. Hence, there is no need to list them separately in the pciserial_board nor parport_pc_pci card tables - they can re-use the plain avlab_* entries. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/parport/parport_serial.c75
1 files changed, 18 insertions, 57 deletions
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 10845253c9e0..d121644646b9 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -31,14 +31,8 @@ enum parport_pc_pci_cards {
31 netmos_9xx5_combo, 31 netmos_9xx5_combo,
32 netmos_9855, 32 netmos_9855,
33 avlab_1s1p, 33 avlab_1s1p,
34 avlab_1s1p_650,
35 avlab_1s1p_850,
36 avlab_1s2p, 34 avlab_1s2p,
37 avlab_1s2p_650,
38 avlab_1s2p_850,
39 avlab_2s1p, 35 avlab_2s1p,
40 avlab_2s1p_650,
41 avlab_2s1p_850,
42 siig_1s1p_10x, 36 siig_1s1p_10x,
43 siig_2s1p_10x, 37 siig_2s1p_10x,
44 siig_2p1s_20x, 38 siig_2p1s_20x,
@@ -85,14 +79,8 @@ static struct parport_pc_pci cards[] __devinitdata = {
85 /* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init }, 79 /* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init },
86 /* netmos_9855 */ { 1, { { 0, -1 }, }, netmos_parallel_init }, 80 /* netmos_9855 */ { 1, { { 0, -1 }, }, netmos_parallel_init },
87 /* avlab_1s1p */ { 1, { { 1, 2}, } }, 81 /* avlab_1s1p */ { 1, { { 1, 2}, } },
88 /* avlab_1s1p_650 */ { 1, { { 1, 2}, } },
89 /* avlab_1s1p_850 */ { 1, { { 1, 2}, } },
90 /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, 82 /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} },
91 /* avlab_1s2p_650 */ { 2, { { 1, 2}, { 3, 4 },} },
92 /* avlab_1s2p_850 */ { 2, { { 1, 2}, { 3, 4 },} },
93 /* avlab_2s1p */ { 1, { { 2, 3}, } }, 83 /* avlab_2s1p */ { 1, { { 2, 3}, } },
94 /* avlab_2s1p_650 */ { 1, { { 2, 3}, } },
95 /* avlab_2s1p_850 */ { 1, { { 2, 3}, } },
96 /* siig_1s1p_10x */ { 1, { { 3, 4 }, } }, 84 /* siig_1s1p_10x */ { 1, { { 3, 4 }, } },
97 /* siig_2s1p_10x */ { 1, { { 4, 5 }, } }, 85 /* siig_2s1p_10x */ { 1, { { 4, 5 }, } },
98 /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } }, 86 /* siig_2p1s_20x */ { 2, { { 1, 2 }, { 3, 4 }, } },
@@ -119,15 +107,24 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
119 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, 107 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
120 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 }, 108 PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },
121 /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ 109 /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
122 { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p}, 110 { PCI_VENDOR_ID_AFAVLAB, 0x2110,
123 { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650}, 111 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
124 { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850}, 112 { PCI_VENDOR_ID_AFAVLAB, 0x2111,
125 { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p}, 113 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
126 { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650}, 114 { PCI_VENDOR_ID_AFAVLAB, 0x2112,
127 { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850}, 115 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
128 { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p}, 116 { PCI_VENDOR_ID_AFAVLAB, 0x2140,
129 { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650}, 117 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
130 { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850}, 118 { PCI_VENDOR_ID_AFAVLAB, 0x2141,
119 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
120 { PCI_VENDOR_ID_AFAVLAB, 0x2142,
121 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
122 { PCI_VENDOR_ID_AFAVLAB, 0x2160,
123 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
124 { PCI_VENDOR_ID_AFAVLAB, 0x2161,
125 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
126 { PCI_VENDOR_ID_AFAVLAB, 0x2162,
127 PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
131 { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550, 128 { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550,
132 PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x }, 129 PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
133 { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650, 130 { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650,
@@ -201,54 +198,18 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = {
201 .base_baud = 115200, 198 .base_baud = 115200,
202 .uart_offset = 8, 199 .uart_offset = 8,
203 }, 200 },
204 [avlab_1s1p_650] = { /* nt */
205 .flags = FL_BASE0 | FL_BASE_BARS,
206 .num_ports = 1,
207 .base_baud = 115200,
208 .uart_offset = 8,
209 },
210 [avlab_1s1p_850] = { /* nt */
211 .flags = FL_BASE0 | FL_BASE_BARS,
212 .num_ports = 1,
213 .base_baud = 115200,
214 .uart_offset = 8,
215 },
216 [avlab_1s2p] = { /* n/t */ 201 [avlab_1s2p] = { /* n/t */
217 .flags = FL_BASE0 | FL_BASE_BARS, 202 .flags = FL_BASE0 | FL_BASE_BARS,
218 .num_ports = 1, 203 .num_ports = 1,
219 .base_baud = 115200, 204 .base_baud = 115200,
220 .uart_offset = 8, 205 .uart_offset = 8,
221 }, 206 },
222 [avlab_1s2p_650] = { /* nt */
223 .flags = FL_BASE0 | FL_BASE_BARS,
224 .num_ports = 1,
225 .base_baud = 115200,
226 .uart_offset = 8,
227 },
228 [avlab_1s2p_850] = { /* nt */
229 .flags = FL_BASE0 | FL_BASE_BARS,
230 .num_ports = 1,
231 .base_baud = 115200,
232 .uart_offset = 8,
233 },
234 [avlab_2s1p] = { /* n/t */ 207 [avlab_2s1p] = { /* n/t */
235 .flags = FL_BASE0 | FL_BASE_BARS, 208 .flags = FL_BASE0 | FL_BASE_BARS,
236 .num_ports = 2, 209 .num_ports = 2,
237 .base_baud = 115200, 210 .base_baud = 115200,
238 .uart_offset = 8, 211 .uart_offset = 8,
239 }, 212 },
240 [avlab_2s1p_650] = { /* nt */
241 .flags = FL_BASE0 | FL_BASE_BARS,
242 .num_ports = 2,
243 .base_baud = 115200,
244 .uart_offset = 8,
245 },
246 [avlab_2s1p_850] = { /* nt */
247 .flags = FL_BASE0 | FL_BASE_BARS,
248 .num_ports = 2,
249 .base_baud = 115200,
250 .uart_offset = 8,
251 },
252 [siig_1s1p_10x] = { 213 [siig_1s1p_10x] = {
253 .flags = FL_BASE2, 214 .flags = FL_BASE2,
254 .num_ports = 1, 215 .num_ports = 1,
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-17 23:11:14 -0500