Commit 64f2f933 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_common: use PCI_VENDOR_ID_ADDIDATA_OLD 



The kernel provides this id in pci_ids.h. Use it instead of creating
duplicates of the id with different names.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6365c0b

drivers/staging/comedi/drivers/addi-data/addi_common.c

+6 −6
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void fpu_end(void) 


static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {

#ifdef CONFIG_APCI_3120

	{PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x818D)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x818D)},

#endif

#ifdef CONFIG_APCI_1032

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003)},
@@ -165,10 +165,10 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = { 
	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006)},

#endif

#ifdef CONFIG_APCI_1500

	{PCI_DEVICE(APCI1500_BOARD_VENDOR_ID, 0x80fc)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc)},

#endif

#ifdef CONFIG_APCI_3001

	{PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x828D)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x828D)},

#endif

#ifdef CONFIG_APCI_3501

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001)},
@@ -225,7 +225,7 @@ static const struct addi_board boardtypes[] = { 
#ifdef CONFIG_APCI_3120

	{

		.pc_DriverName		= "apci3120",

		.i_VendorId		= APCI3120_BOARD_VENDOR_ID,

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,

		.i_DeviceId		= 0x818D,

		.i_IorangeBase0		= AMCC_OP_REG_SIZE,

		.i_IorangeBase1		= APCI3120_ADDRESS_RANGE,
@@ -403,7 +403,7 @@ static const struct addi_board boardtypes[] = { 
#ifdef CONFIG_APCI_1500

	{

		.pc_DriverName		= "apci1500",

		.i_VendorId		= APCI1500_BOARD_VENDOR_ID,

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,

		.i_DeviceId		= 0x80fc,

		.i_IorangeBase0		= 128,

		.i_IorangeBase1		= APCI1500_ADDRESS_RANGE,
@@ -431,7 +431,7 @@ static const struct addi_board boardtypes[] = { 
#ifdef CONFIG_APCI_3001

	{

		.pc_DriverName		= "apci3001",

		.i_VendorId		= APCI3120_BOARD_VENDOR_ID,

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,

		.i_DeviceId		= 0x828D,

		.i_IorangeBase0		= AMCC_OP_REG_SIZE,

		.i_IorangeBase1		= APCI3120_ADDRESS_RANGE,

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
/*********      Definitions for APCI-1500 card  *****/



/* Card Specific information */

#define APCI1500_BOARD_VENDOR_ID           0x10e8

#define APCI1500_ADDRESS_RANGE              4



/* DIGITAL INPUT-OUTPUT DEFINE */

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ static const struct comedi_lrange range_apci3120_ao = { 2, { 


#define APCI3120_BIPOLAR_RANGES	4	/*  used for test on mixture of BIP/UNI ranges */



#define APCI3120_BOARD_VENDOR_ID                 0x10E8

#define APCI3120_ADDRESS_RANGE            			16



#define APCI3120_DISABLE                         0

CRA Git | Maintained and supported by SUSTech CRA and CCSE