[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>

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 {
         netmos_9xx5_combo,
         netmos_9855,
         avlab_1s1p,
-        avlab_1s1p_650,
-        avlab_1s1p_850,
         avlab_1s2p,
-        avlab_1s2p_650,
-        avlab_1s2p_850,
         avlab_2s1p,
-        avlab_2s1p_650,
-        avlab_2s1p_850,
         siig_1s1p_10x,
         siig_2s1p_10x,
         siig_2p1s_20x,
@@ -85,14 +79,8 @@ static struct parport_pc_pci cards[] __devinitdata = {
         /* netmos_9xx5_combo */         { 1, { { 2, -1 }, }, netmos_parallel_init },
         /* netmos_9855 */               { 1, { { 0, -1 }, }, netmos_parallel_init },
         /* avlab_1s1p     */            { 1, { { 1, 2}, } },
-        /* avlab_1s1p_650 */            { 1, { { 1, 2}, } },
-        /* avlab_1s1p_850 */            { 1, { { 1, 2}, } },
         /* avlab_1s2p     */            { 2, { { 1, 2}, { 3, 4 },} },
-        /* avlab_1s2p_650 */            { 2, { { 1, 2}, { 3, 4 },} },
-        /* avlab_1s2p_850 */            { 2, { { 1, 2}, { 3, 4 },} },
         /* avlab_2s1p     */            { 1, { { 2, 3}, } },
-        /* avlab_2s1p_650 */            { 1, { { 2, 3}, } },
-        /* avlab_2s1p_850 */            { 1, { { 2, 3}, } },
         /* siig_1s1p_10x */             { 1, { { 3, 4 }, } },
         /* siig_2s1p_10x */             { 1, { { 4, 5 }, } },
         /* siig_2p1s_20x */             { 2, { { 1, 2 }, { 3, 4 }, } },
@@ -119,15 +107,24 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
         { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },
         /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
-        { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p},
-        { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650},
-        { 0x14db, 0x2112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_850},
-        { 0x14db, 0x2140, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p},
-        { 0x14db, 0x2141, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_650},
-        { 0x14db, 0x2142, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p_850},
-        { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p},
-        { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650},
-        { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850},
+        { PCI_VENDOR_ID_AFAVLAB, 0x2110,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2111,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2112,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2140,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2141,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2142,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2160,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2161,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
+        { PCI_VENDOR_ID_AFAVLAB, 0x2162,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
         { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
         { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650,
@@ -201,54 +198,18 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = {
                 .base_baud      = 115200,
                 .uart_offset    = 8,
         },
-        [avlab_1s1p_650] = { /* nt */
-                .flags          = FL_BASE0 | FL_BASE_BARS,
-                .num_ports      = 1,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-        [avlab_1s1p_850] = { /* nt */
-                .flags          = FL_BASE0 | FL_BASE_BARS,
-                .num_ports      = 1,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
         [avlab_1s2p] = { /* n/t */
                 .flags          = FL_BASE0 | FL_BASE_BARS,
                 .num_ports      = 1,
                 .base_baud      = 115200,
                 .uart_offset    = 8,
         },
-        [avlab_1s2p_650] = { /* nt */
-                .flags          = FL_BASE0 | FL_BASE_BARS,
-                .num_ports      = 1,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-        [avlab_1s2p_850] = { /* nt */
-                .flags          = FL_BASE0 | FL_BASE_BARS,
-                .num_ports      = 1,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
         [avlab_2s1p] = { /* n/t */
                 .flags          = FL_BASE0 | FL_BASE_BARS,
                 .num_ports      = 2,
                 .base_baud      = 115200,
                 .uart_offset    = 8,
         },
-        [avlab_2s1p_650] = { /* nt */
-                .flags          = FL_BASE0 | FL_BASE_BARS,
-                .num_ports      = 2,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-        [avlab_2s1p_850] = { /* nt */
-                .flags          = FL_BASE0 | FL_BASE_BARS,
-                .num_ports      = 2,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
         [siig_1s1p_10x] = {
                 .flags          = FL_BASE2,
                 .num_ports      = 1,