Skip to content

L
linux
Commit b9beb6c7 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: addi_common: remove 'i_VendorId' and 'i_Device Id' 

The vendor/device ids in the boardinfo are not longer needed. Remove
them.
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 26670791
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 62 deletions
drivers/staging/comedi/drivers/addi-data/addi_common.h
View file @ b9beb6c7
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
/* structure for the boardtype */ /* structure for the boardtype */
struct addi_board { struct addi_board {
const char *pc_DriverName; /* driver name */ const char *pc_DriverName; /* driver name */
int i_VendorId; /* PCI vendor a device ID of card */
int i_DeviceId;
int i_IorangeBase0; int i_IorangeBase0;
int i_IorangeBase1; int i_IorangeBase1;
int i_IorangeBase2; /* base 2 range */ int i_IorangeBase2; /* base 2 range */
......
drivers/staging/comedi/drivers/addi_apci_035.c
View file @ b9beb6c7
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
static const struct addi_board apci035_boardtypes[] = { static const struct addi_board apci035_boardtypes[] = {
{ {
.pc_DriverName = "apci035", .pc_DriverName = "apci035",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x0300,
.i_IorangeBase0 = 127, .i_IorangeBase0 = 127,
.i_IorangeBase1 = APCI035_ADDRESS_RANGE, .i_IorangeBase1 = APCI035_ADDRESS_RANGE,
.i_PCIEeprom = 1, .i_PCIEeprom = 1,
......
drivers/staging/comedi/drivers/addi_apci_1500.c
View file @ b9beb6c7
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
static const struct addi_board apci1500_boardtypes[] = { static const struct addi_board apci1500_boardtypes[] = {
{ {
.pc_DriverName = "apci1500", .pc_DriverName = "apci1500",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD,
.i_DeviceId = 0x80fc,
.i_IorangeBase0 = 128, .i_IorangeBase0 = 128,
.i_IorangeBase1 = APCI1500_ADDRESS_RANGE, .i_IorangeBase1 = APCI1500_ADDRESS_RANGE,
.i_IorangeBase2 = 4, .i_IorangeBase2 = 4,
......
drivers/staging/comedi/drivers/addi_apci_1564.c
View file @ b9beb6c7
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
static const struct addi_board apci1564_boardtypes[] = { static const struct addi_board apci1564_boardtypes[] = {
{ {
.pc_DriverName = "apci1564", .pc_DriverName = "apci1564",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x1006,
.i_IorangeBase0 = 128, .i_IorangeBase0 = 128,
.i_IorangeBase1 = APCI1564_ADDRESS_RANGE, .i_IorangeBase1 = APCI1564_ADDRESS_RANGE,
.i_PCIEeprom = ADDIDATA_EEPROM, .i_PCIEeprom = ADDIDATA_EEPROM,
......
drivers/staging/comedi/drivers/addi_apci_3200.c
View file @ b9beb6c7
...@@ -30,8 +30,6 @@ enum apci3200_boardid { ...@@ -30,8 +30,6 @@ enum apci3200_boardid {
static const struct addi_board apci3200_boardtypes[] = { static const struct addi_board apci3200_boardtypes[] = {
[BOARD_APCI3200] = { [BOARD_APCI3200] = {
.pc_DriverName = "apci3200", .pc_DriverName = "apci3200",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3000,
.i_IorangeBase0 = 128, .i_IorangeBase0 = 128,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 4, .i_IorangeBase2 = 4,
...@@ -61,8 +59,6 @@ static const struct addi_board apci3200_boardtypes[] = { ...@@ -61,8 +59,6 @@ static const struct addi_board apci3200_boardtypes[] = {
}, },
[BOARD_APCI3300] = { [BOARD_APCI3300] = {
.pc_DriverName = "apci3300", .pc_DriverName = "apci3300",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3007,
.i_IorangeBase0 = 128, .i_IorangeBase0 = 128,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 4, .i_IorangeBase2 = 4,
......
drivers/staging/comedi/drivers/addi_apci_3xxx.c
View file @ b9beb6c7
...@@ -41,8 +41,6 @@ enum apci3xxx_boardid { ...@@ -41,8 +41,6 @@ enum apci3xxx_boardid {
static const struct addi_board apci3xxx_boardtypes[] = { static const struct addi_board apci3xxx_boardtypes[] = {
[BOARD_APCI3000_16] = { [BOARD_APCI3000_16] = {
.pc_DriverName = "apci3000-16", .pc_DriverName = "apci3000-16",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3010,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -68,8 +66,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -68,8 +66,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3000_8] = { [BOARD_APCI3000_8] = {
.pc_DriverName = "apci3000-8", .pc_DriverName = "apci3000-8",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x300F,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -95,8 +91,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -95,8 +91,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3000_4] = { [BOARD_APCI3000_4] = {
.pc_DriverName = "apci3000-4", .pc_DriverName = "apci3000-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x300E,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -122,8 +116,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -122,8 +116,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3006_16] = { [BOARD_APCI3006_16] = {
.pc_DriverName = "apci3006-16", .pc_DriverName = "apci3006-16",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3013,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -149,8 +141,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -149,8 +141,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3006_8] = { [BOARD_APCI3006_8] = {
.pc_DriverName = "apci3006-8", .pc_DriverName = "apci3006-8",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3014,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -176,8 +166,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -176,8 +166,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3006_4] = { [BOARD_APCI3006_4] = {
.pc_DriverName = "apci3006-4", .pc_DriverName = "apci3006-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3015,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -203,8 +191,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -203,8 +191,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3010_16] = { [BOARD_APCI3010_16] = {
.pc_DriverName = "apci3010-16", .pc_DriverName = "apci3010-16",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3016,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -235,8 +221,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -235,8 +221,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3010_8] = { [BOARD_APCI3010_8] = {
.pc_DriverName = "apci3010-8", .pc_DriverName = "apci3010-8",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3017,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -267,8 +251,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -267,8 +251,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3010_4] = { [BOARD_APCI3010_4] = {
.pc_DriverName = "apci3010-4", .pc_DriverName = "apci3010-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3018,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -299,8 +281,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -299,8 +281,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3016_16] = { [BOARD_APCI3016_16] = {
.pc_DriverName = "apci3016-16", .pc_DriverName = "apci3016-16",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3019,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -331,8 +311,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -331,8 +311,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3016_8] = { [BOARD_APCI3016_8] = {
.pc_DriverName = "apci3016-8", .pc_DriverName = "apci3016-8",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x301A,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -363,8 +341,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -363,8 +341,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3016_4] = { [BOARD_APCI3016_4] = {
.pc_DriverName = "apci3016-4", .pc_DriverName = "apci3016-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x301B,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -395,8 +371,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -395,8 +371,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3100_16_4] = { [BOARD_APCI3100_16_4] = {
.pc_DriverName = "apci3100-16-4", .pc_DriverName = "apci3100-16-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x301C,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -426,8 +400,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -426,8 +400,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3100_8_4] = { [BOARD_APCI3100_8_4] = {
.pc_DriverName = "apci3100-8-4", .pc_DriverName = "apci3100-8-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x301D,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -457,8 +429,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -457,8 +429,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3106_16_4] = { [BOARD_APCI3106_16_4] = {
.pc_DriverName = "apci3106-16-4", .pc_DriverName = "apci3106-16-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x301E,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -488,8 +458,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -488,8 +458,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3106_8_4] = { [BOARD_APCI3106_8_4] = {
.pc_DriverName = "apci3106-8-4", .pc_DriverName = "apci3106-8-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x301F,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -519,8 +487,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -519,8 +487,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3110_16_4] = { [BOARD_APCI3110_16_4] = {
.pc_DriverName = "apci3110-16-4", .pc_DriverName = "apci3110-16-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3020,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -555,8 +521,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -555,8 +521,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3110_8_4] = { [BOARD_APCI3110_8_4] = {
.pc_DriverName = "apci3110-8-4", .pc_DriverName = "apci3110-8-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3021,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -591,8 +555,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -591,8 +555,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3116_16_4] = { [BOARD_APCI3116_16_4] = {
.pc_DriverName = "apci3116-16-4", .pc_DriverName = "apci3116-16-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3022,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -627,8 +589,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -627,8 +589,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3116_8_4] = { [BOARD_APCI3116_8_4] = {
.pc_DriverName = "apci3116-8-4", .pc_DriverName = "apci3116-8-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3023,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -663,8 +623,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -663,8 +623,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3003] = { [BOARD_APCI3003] = {
.pc_DriverName = "apci3003", .pc_DriverName = "apci3003",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x300B,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -689,8 +647,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -689,8 +647,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3002_16] = { [BOARD_APCI3002_16] = {
.pc_DriverName = "apci3002-16", .pc_DriverName = "apci3002-16",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3002,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -715,8 +671,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -715,8 +671,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3002_8] = { [BOARD_APCI3002_8] = {
.pc_DriverName = "apci3002-8", .pc_DriverName = "apci3002-8",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3003,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -741,8 +695,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -741,8 +695,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3002_4] = { [BOARD_APCI3002_4] = {
.pc_DriverName = "apci3002-4", .pc_DriverName = "apci3002-4",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3004,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
...@@ -767,8 +719,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { ...@@ -767,8 +719,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
}, },
[BOARD_APCI3500] = { [BOARD_APCI3500] = {
.pc_DriverName = "apci3500", .pc_DriverName = "apci3500",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA,
.i_DeviceId = 0x3024,
.i_IorangeBase0 = 256, .i_IorangeBase0 = 256,
.i_IorangeBase1 = 256, .i_IorangeBase1 = 256,
.i_IorangeBase2 = 256, .i_IorangeBase2 = 256,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7