Skip to content

Commit

Permalink
staging: comedi: hwdrv_APCI1710: remove APCI1710_BOARD_VENDOR_ID
Browse files Browse the repository at this point in the history
This vendor id exists in pci_ids.h as PCI_VENDOR_ID_ADDIDATA_OLD.
Use the kernels provided id instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent b77d93a commit 9409e1d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/addi-data/addi_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)},
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9409e1d

Please sign in to comment.