Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee351b2 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22691aec

drivers/staging/comedi/drivers/addi_apci_1500.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/comedi/drivers/addi_apci_1710.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/comedi/drivers/addi_apci_3120.c

+2 −2
Original line number Diff line number Diff line
@@ -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);