diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-10 11:31:46 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 12:54:36 -0700 |
| commit | dcc8adb28638c0c09b29a551f3745f7182b1a04b (patch) | |
| tree | 2b90f786c02dbd29d79238c6aebffcc58c94a5cb | |
| parent | staging: comedi: addi_common: use pci_ioremap_bar() (diff) | |
| download | linux-dev-dcc8adb28638c0c09b29a551f3745f7182b1a04b.tar.xz linux-dev-dcc8adb28638c0c09b29a551f3745f7182b1a04b.zip | |
staging: comedi: addi_common: remove i_IorangeBase3 from boardinfo
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/addi_common.h | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3200.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3xxx.c | 25 |
3 files changed, 0 insertions, 28 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index 19da977fef82..e7ef268e71f0 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -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 */ diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c index 4b492a0897b8..da2d0948d26b 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3200.c +++ b/drivers/staging/comedi/drivers/addi_apci_3200.c @@ -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, @@ -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, diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c index 1afc62cb07c5..36a887609bfc 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c +++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, |