[PATCH] remove SIIG combo cards PCI ids from parport_pc

From: Andrey Panin <pazke@donpac.ru>

support for SIIG made serial/parallel conbo cards was moved to
parport_serial driver some months ago, but their PCI ids still remain in
parport_pc PCI device table.  Attached patch removes them.

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index cfb27b1fe9550f3c655759e4ec36010f8f675bd7..7d23eb46077005aaa7c10b4bb206d26e69b71924 100644 (file)
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2604,25 +2604,10 @@ static struct parport_pc_superio {
 
 
 enum parport_pc_pci_cards {
-       siig_1s1p_10x_550 = last_sio,
-       siig_1s1p_10x_650,
-       siig_1s1p_10x_850,
-       siig_1p_10x,
+       siig_1p_10x = last_sio,
        siig_2p_10x,
-       siig_2s1p_10x_550,
-       siig_2s1p_10x_650,
-       siig_2s1p_10x_850,
        siig_1p_20x,
        siig_2p_20x,
-       siig_2p1s_20x_550,
-       siig_2p1s_20x_650,
-       siig_2p1s_20x_850,
-       siig_1s1p_20x_550,
-       siig_1s1p_20x_650,
-       siig_1s1p_20x_850,
-       siig_2s1p_20x_550,
-       siig_2s1p_20x_650,
-       siig_2s1p_20x_850,
        lava_parallel,
        lava_parallel_dual_a,
        lava_parallel_dual_b,
@@ -2684,25 +2669,10 @@ static struct parport_pc_pci {
         * is non-zero we couldn't use any of the ports. */
        void (*postinit_hook) (struct pci_dev *pdev, int failed);
 } cards[] __devinitdata = {
-       /* siig_1s1p_10x_550 */         { 1, { { 3, 4 }, } },
-       /* siig_1s1p_10x_650 */         { 1, { { 3, 4 }, } },
-       /* siig_1s1p_10x_850 */         { 1, { { 3, 4 }, } },
        /* siig_1p_10x */               { 1, { { 2, 3 }, } },
        /* siig_2p_10x */               { 2, { { 2, 3 }, { 4, 5 }, } },
-       /* siig_2s1p_10x_550 */         { 1, { { 4, 5 }, } },
-       /* siig_2s1p_10x_650 */         { 1, { { 4, 5 }, } },
-       /* siig_2s1p_10x_850 */         { 1, { { 4, 5 }, } },
        /* siig_1p_20x */               { 1, { { 0, 1 }, } },
        /* siig_2p_20x */               { 2, { { 0, 1 }, { 2, 3 }, } },
-       /* siig_2p1s_20x_550 */         { 2, { { 1, 2 }, { 3, 4 }, } },
-       /* siig_2p1s_20x_650 */         { 2, { { 1, 2 }, { 3, 4 }, } },
-       /* siig_2p1s_20x_850 */         { 2, { { 1, 2 }, { 3, 4 }, } },
-       /* siig_1s1p_20x_550 */         { 1, { { 1, 2 }, } },
-       /* siig_1s1p_20x_650 */         { 1, { { 1, 2 }, } },
-       /* siig_1s1p_20x_850 */         { 1, { { 1, 2 }, } },
-       /* siig_2s1p_20x_550 */         { 1, { { 2, 3 }, } },
-       /* siig_2s1p_20x_650 */         { 1, { { 2, 3 }, } },
-       /* siig_2s1p_20x_850 */         { 1, { { 2, 3 }, } },
        /* lava_parallel */             { 1, { { 0, -1 }, } },
        /* lava_parallel_dual_a */      { 1, { { 0, -1 }, } },
        /* lava_parallel_dual_b */      { 1, { { 0, -1 }, } },
@@ -2754,44 +2724,14 @@ static struct pci_device_id parport_pc_pci_tbl[] = {
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_ite_8872 },
 
        /* PCI cards */
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x_550 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x_650 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x_850 },
        { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1P_10x,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1p_10x },
        { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P_10x,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p_10x },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x_550 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x_650 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x_850 },
        { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1P_20x,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1p_20x },
        { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P_20x,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p_20x },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x_550 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x_650 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x_850 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_550 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x_650 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x_850 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_550 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_650 },
-       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_850 },
        { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_PARALLEL,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, lava_parallel },
        { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DUAL_PAR_A,