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

staging: comedi: hwdrv_APCI1710: remove APCI1710_BOARD_VENDOR_ID 



This vendor id exists in pci_ids.h as PCI_VENDOR_ID_ADDIDATA_OLD.
Use the kernels provided id instead.

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 b77d93a0

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

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = { 
	{PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3007)},

#endif

#ifdef CONFIG_APCI_1710

	{PCI_DEVICE(APCI1710_BOARD_VENDOR_ID, APCI1710_BOARD_DEVICE_ID)},

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, APCI1710_BOARD_DEVICE_ID)},

#endif

#ifdef CONFIG_APCI_16XX

	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009)},
@@ -594,7 +594,7 @@ static const struct addi_board boardtypes[] = { 
#ifdef CONFIG_APCI_1710

	{

		.pc_DriverName		= "apci1710",

		.i_VendorId		= APCI1710_BOARD_VENDOR_ID,

		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,

		.i_DeviceId		= APCI1710_BOARD_DEVICE_ID,

		.i_IorangeBase0		= 128,

		.i_IorangeBase1		= 8,

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

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define COMEDI_SUBD_INCREMENTALCOUNTER	17	/* Incremental Counter */



#define APCI1710_BOARD_NAME		"apci1710"

#define APCI1710_BOARD_VENDOR_ID	0x10E8

#define APCI1710_BOARD_DEVICE_ID	0x818F

#define APCI1710_ADDRESS_RANGE		256

#define APCI1710_CONFIG_ADDRESS_RANGE	8

CRA Git | Maintained and supported by SUSTech CRA and CCSE