WAN: remove deprecated PCI_DEVICE_ID from PCI200SYN driver.
authorKrzysztof Halasa <khc@pm.waw.pl>
Sat, 5 Sep 2009 00:54:30 +0000 (00:54 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Sep 2009 08:56:45 +0000 (01:56 -0700)
PCI200SYN has its own PCI subsystem device ID for 3+ years, now it's
time to remove the generic PLX905[02] ID from the driver. Anyone with
old EEPROM data will have to run the upgrade.

Having the generic PLX905[02] (PCI-local bus bridge) ID is harmful
as the driver tries to handle other devices based on these bridges.

Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wan/pci200syn.c

index e035d8c57e119b5d0a875d503b25821c1b64b548..a52f29c72c33eeed101ea834607072267e60af95 100644 (file)
@@ -360,15 +360,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
               " %u RX packets rings\n", ramsize / 1024, ramphys,
               pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers);
 
-       if (pdev->subsystem_device == PCI_DEVICE_ID_PLX_9050) {
-               printk(KERN_ERR "Detected PCI200SYN card with old "
-                      "configuration data.\n");
-               printk(KERN_ERR "See <http://www.kernel.org/pub/"
-                      "linux/utils/net/hdlc/pci200syn/> for update.\n");
-               printk(KERN_ERR "The card will stop working with"
-                      " future versions of Linux if not updated.\n");
-       }
-
        if (card->tx_ring_buffers < 1) {
                printk(KERN_ERR "pci200syn: RAM test failed\n");
                pci200_pci_remove_one(pdev);
@@ -426,8 +417,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
 
 
 static struct pci_device_id pci200_pci_tbl[] __devinitdata = {
-       { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,
-         PCI_DEVICE_ID_PLX_9050, 0, 0, 0 },
        { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,
          PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 },
        { 0, }