staging: comedi: addi_apci_*: replace ADDIDATA_OLD with AMCC

PCI vendor ID 0x10e8 is assigned to Applied Micro Circuits Corporation
(recently AppliedMicro, but AMCC on NASDAQ).  The ID currently appears
as `PCI_VENDOR_ID_ADDIDATA_OLD` in "include/linux/pci_ids.h" and is used
by the "addi_apci_1500", "addi_apci_1710" and "addi_apci_3120" comedi
drivers.  (It is also used by the "8250_pci" serial driver.)

"comedidev.h" defines `PCI_VENDOR_ID_AMCC` locally with the same value
as `PCI_VENDOR_ID_ADDIDATA_OLD` and is currently used by the
"adl_pci9118" comedi driver.  Despite `PCI_VENDOR_ID_ADDIDATA_OLD` being
in "pci_ids.h", `PCI_VENDOR_ID_AMCC` is a more sensible name, so change
the comedi drivers to use it.

Once several drivers are using `PCI_VENDOR_ID_AMCC` we'll have a good
excuse to move it into "pci_ids.h" and change the "8250_pci" serial
driver to use it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index 94876c6450e57bf178e658125a46ca5960344ed6..b52cfe01e6c836d73c130a2a2e0ac51894615817 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -57,7 +57,7 @@ static int apci1500_pci_probe(struct pci_dev *dev,
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = {
-       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMCC, 0x80fc) },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, apci1500_pci_table);

diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index acde462a69275e8d9ccd3f3103bd8618852e1c7a..c9e6471eb06ba1c6f3f499cd7b0f90f3e1a51958 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -81,7 +81,7 @@ static int apci1710_pci_probe(struct pci_dev *dev,
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci1710_pci_table) = {
-       { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, APCI1710_BOARD_DEVICE_ID) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMCC, APCI1710_BOARD_DEVICE_ID) },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, apci1710_pci_table);

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 1c5ac16aad156226b1b928aec6508d074279a6eb..317a26d97c2e73a76368ff7b9c04103c61d0ba17 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -238,8 +238,8 @@ static int apci3120_pci_probe(struct pci_dev *dev,
 }
 
 static DEFINE_PCI_DEVICE_TABLE(apci3120_pci_table) = {
-       { PCI_VDEVICE(ADDIDATA_OLD, 0x818d), BOARD_APCI3120 },
-       { PCI_VDEVICE(ADDIDATA_OLD, 0x828d), BOARD_APCI3001 },
+       { PCI_VDEVICE(AMCC, 0x818d), BOARD_APCI3120 },
+       { PCI_VDEVICE(AMCC, 0x828d), BOARD_APCI3001 },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, apci3120_pci_table);