WAN: remove deprecated PCI_DEVICE_ID from PCI200SYN driver.
Subsystems (3)
Krzysztof Halasa
maintainerPATCH 1/1 WAN: remove deprecated PCI_DEVICE_ID from PCI200SYN driver.
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.
Signature · 29 lines
Krzysztof Halasa
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -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);
@@ -427,8 +418,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, }
};David Miller
maintainerFrom: Krzysztof Halasa <[email protected]>
Date: Fri, 04 Sep 2009 19:50:16 +0200
Quoted 6 lines
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.
Please provide a proper signoff with all patches.
Thanks.
Krzysztof Halasa
maintainerQuoted 1 line · David Miller
Please provide a proper signoff with all patches.
Oops. Sure.
Signature · 1 line
Krzysztof Halasa
Krzysztof Halasa
maintainerPATCH 1/1 WAN: remove deprecated PCI_DEVICE_ID from PCI200SYN driver.
In reply to Krzysztof HalasaPCI200SYN 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.
drivers/net/wan/pci200syn.c +0 -11
@@ -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);
@@ -427,8 +418,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 , } };
Signature · 1 line
Krzysztof Halasa
From: Krzysztof Halasa <[email protected]>
Date: Sat, 05 Sep 2009 12:54:30 +0200
Quoted 8 lines
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 <[email protected]>
Applied to net-next-2.6, thanks.