From 728394d9d059ce16369c22d956bb3315fd014859 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 10 Apr 2013 11:32:07 -0700 Subject: [PATCH] staging: comedi: addi_common: remove i_IorangeBase2 from boardinfo The i_IorangeBase2 boardinfo is not used. Remove it. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- .../comedi/drivers/addi-data/addi_common.h | 1 - .../staging/comedi/drivers/addi_apci_1500.c | 1 - .../staging/comedi/drivers/addi_apci_3200.c | 2 -- .../staging/comedi/drivers/addi_apci_3xxx.c | 25 ------------------- 4 files changed, 29 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index e7ef268e71f0..5ed61b9fbca7 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -47,7 +47,6 @@ struct addi_board { const char *pc_DriverName; /* driver name */ int i_IorangeBase0; int i_IorangeBase1; - int i_IorangeBase2; /* base 2 range */ int i_PCIEeprom; /* eeprom present or not */ char *pc_EepromChip; /* type of chip */ int i_NbrAiChannel; /* num of A/D chans */ diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c index 1170e7688f39..a4495fb1a792 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1500.c +++ b/drivers/staging/comedi/drivers/addi_apci_1500.c @@ -15,7 +15,6 @@ static const struct addi_board apci1500_boardtypes[] = { .pc_DriverName = "apci1500", .i_IorangeBase0 = 128, .i_IorangeBase1 = APCI1500_ADDRESS_RANGE, - .i_IorangeBase2 = 4, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .i_NbrDiChannel = 16, .i_NbrDoChannel = 16, diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c index da2d0948d26b..7a960ac3d1eb 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3200.c +++ b/drivers/staging/comedi/drivers/addi_apci_3200.c @@ -32,7 +32,6 @@ static const struct addi_board apci3200_boardtypes[] = { .pc_DriverName = "apci3200", .i_IorangeBase0 = 128, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 4, .i_PCIEeprom = ADDIDATA_EEPROM, .pc_EepromChip = ADDIDATA_S5920, .i_NbrAiChannel = 16, @@ -60,7 +59,6 @@ static const struct addi_board apci3200_boardtypes[] = { .pc_DriverName = "apci3300", .i_IorangeBase0 = 128, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 4, .i_PCIEeprom = ADDIDATA_EEPROM, .pc_EepromChip = ADDIDATA_S5920, .i_NbrAiChannelDiff = 8, diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c index 36a887609bfc..12875973f118 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c +++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c @@ -43,7 +43,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3000-16", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -67,7 +66,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3000-8", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -91,7 +89,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3000-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 4, @@ -115,7 +112,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3006-16", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -139,7 +135,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3006-8", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -163,7 +158,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3006-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 4, @@ -187,7 +181,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3010-16", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -216,7 +209,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3010-8", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -245,7 +237,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3010-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 4, @@ -274,7 +265,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3016-16", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -303,7 +293,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3016-8", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -332,7 +321,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3016-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 4, @@ -361,7 +349,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3100-16-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -389,7 +376,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3100-8-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -417,7 +403,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3106-16-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -445,7 +430,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3106-8-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -473,7 +457,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3110-16-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -506,7 +489,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3110-8-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -539,7 +521,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3116-16-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 16, @@ -572,7 +553,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3116-8-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannel = 8, @@ -605,7 +585,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3003", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannelDiff = 4, @@ -628,7 +607,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3002-16", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannelDiff = 16, @@ -651,7 +629,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3002-8", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannelDiff = 8, @@ -674,7 +651,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3002-4", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAiChannelDiff = 4, @@ -697,7 +673,6 @@ static const struct addi_board apci3xxx_boardtypes[] = { .pc_DriverName = "apci3500", .i_IorangeBase0 = 256, .i_IorangeBase1 = 256, - .i_IorangeBase2 = 256, .i_PCIEeprom = ADDIDATA_NO_EEPROM, .pc_EepromChip = ADDIDATA_9054, .i_NbrAoChannel = 4, -- 2.30.2