staging: comedi: addi_apci_3120: remove the 'i_IorangeBase*'

These values in the boardinfor were used in the common addi-data
attach code to work out use of the PCI bars. Since this driver
has a localized attach we already know the use of the bars so
this information in the boardinfo is unnecessary.

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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 9ef9275c8775870bc485ca59f01c717c857e41dc..7a18f7a381aa0cbd6f1005cfa9cc6ab2e34e285a 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -15,9 +15,6 @@ static const struct addi_board apci3120_boardtypes[] = {
                .pc_DriverName          = "apci3120",
                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
                .i_DeviceId             = 0x818D,
-               .i_IorangeBase0         = AMCC_OP_REG_SIZE,
-               .i_IorangeBase1         = APCI3120_ADDRESS_RANGE,
-               .i_IorangeBase2         = 8,
                .i_NbrAiChannel         = 16,
                .i_NbrAiChannelDiff     = 8,
                .i_AiChannelList        = 16,
@@ -38,9 +35,6 @@ static const struct addi_board apci3120_boardtypes[] = {
                .pc_DriverName          = "apci3001",
                .i_VendorId             = PCI_VENDOR_ID_ADDIDATA_OLD,
                .i_DeviceId             = 0x828D,
-               .i_IorangeBase0         = AMCC_OP_REG_SIZE,
-               .i_IorangeBase1         = APCI3120_ADDRESS_RANGE,
-               .i_IorangeBase2         = 8,
                .i_NbrAiChannel         = 16,
                .i_NbrAiChannelDiff     = 8,
                .i_AiChannelList        = 16,
@@ -106,11 +100,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
                return ret;
        pci_set_master(pcidev);
 
-       if (this_board->i_IorangeBase1)
-               dev->iobase = pci_resource_start(pcidev, 1);
-       else
-               dev->iobase = pci_resource_start(pcidev, 0);
-
+       dev->iobase = pci_resource_start(pcidev, 1);
        devpriv->iobase = dev->iobase;
        devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
        devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);