Skip to content

Commit

Permalink
staging: comedi: addi_common: remove i_IorangeBase3 from boardinfo
Browse files Browse the repository at this point in the history 
When it is used, the entire PCI bar is ioremap'ed with pci_ioremap_bar().
The i_IorangeBase3 boardinfo is no longer needed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: 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 Apr 11, 2013
1 parent 6c5961e commit dcc8adb
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 28 deletions.
1 change: 0 additions & 1 deletion drivers/staging/comedi/drivers/addi-data/addi_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ struct addi_board {
int i_IorangeBase0;
int i_IorangeBase1;
int i_IorangeBase2; /* base 2 range */
int i_IorangeBase3; /* base 3 range */
int i_PCIEeprom; /* eeprom present or not */
char *pc_EepromChip; /* type of chip */
int i_NbrAiChannel; /* num of A/D chans */
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/drivers/addi_apci_3200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ static const struct addi_board apci3200_boardtypes[] = {
.i_IorangeBase0 = 128,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 4,
.i_IorangeBase3 = 4,
.i_PCIEeprom = ADDIDATA_EEPROM,
.pc_EepromChip = ADDIDATA_S5920,
.i_NbrAiChannel = 16,
Expand Down Expand Up @@ -62,7 +61,6 @@ static const struct addi_board apci3200_boardtypes[] = {
.i_IorangeBase0 = 128,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 4,
.i_IorangeBase3 = 4,
.i_PCIEeprom = ADDIDATA_EEPROM,
.pc_EepromChip = ADDIDATA_S5920,
.i_NbrAiChannelDiff = 8,
Expand Down
25 changes: 0 additions & 25 deletions drivers/staging/comedi/drivers/addi_apci_3xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand All @@ -69,7 +68,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand All @@ -94,7 +92,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 4,
Expand All @@ -119,7 +116,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand All @@ -144,7 +140,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand All @@ -169,7 +164,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 4,
Expand All @@ -194,7 +188,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand Down Expand Up @@ -224,7 +217,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand Down Expand Up @@ -254,7 +246,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 4,
Expand Down Expand Up @@ -284,7 +275,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand Down Expand Up @@ -314,7 +304,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand Down Expand Up @@ -344,7 +333,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 4,
Expand Down Expand Up @@ -374,7 +362,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand Down Expand Up @@ -403,7 +390,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand Down Expand Up @@ -432,7 +418,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand Down Expand Up @@ -461,7 +446,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand Down Expand Up @@ -490,7 +474,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand Down Expand Up @@ -524,7 +507,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand Down Expand Up @@ -558,7 +540,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 16,
Expand Down Expand Up @@ -592,7 +573,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannel = 8,
Expand Down Expand Up @@ -626,7 +606,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannelDiff = 4,
Expand All @@ -650,7 +629,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannelDiff = 16,
Expand All @@ -674,7 +652,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannelDiff = 8,
Expand All @@ -698,7 +675,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAiChannelDiff = 4,
Expand All @@ -722,7 +698,6 @@ static const struct addi_board apci3xxx_boardtypes[] = {
.i_IorangeBase0 = 256,
.i_IorangeBase1 = 256,
.i_IorangeBase2 = 256,
.i_IorangeBase3 = 256,
.i_PCIEeprom = ADDIDATA_NO_EEPROM,
.pc_EepromChip = ADDIDATA_9054,
.i_NbrAoChannel = 4,
Expand Down

0 comments on commit dcc8adb

Please sign in to comment.