staging: comedi: cb_pcidas: remove the PCI BAR index defines
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 27 Jun 2012 00:54:38 +0000 (17:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2012 22:23:50 +0000 (15:23 -0700)
The defines for the "indices of the base address regions" don't
add much to the readability of the code. They are only used in
the pci_resource_start() calls to get the base address for
the various io regions and the names of the variables provide
adequate documentation.

Remove the defines and just use the open-coded values for the
BARs. Also, remove the incomplete comment above the initialization
of the variables.

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>
drivers/staging/comedi/drivers/cb_pcidas.c

index 990e6aba9c0f80d9c9f7de031270856a5436ebd2..4e5f1ba77ac7aac10f81f08c8ad3eaa4b88d4989 100644 (file)
@@ -92,14 +92,6 @@ analog triggering on 1602 series
 #define NUM_CHANNELS_8402 2
 #define NUM_CHANNELS_DAC08 1
 
-/* PCI-DAS base addresses */
-
-/* indices of base address regions */
-#define S5933_BADRINDEX 0
-#define CONT_STAT_BADRINDEX 1
-#define ADC_FIFO_BADRINDEX 2
-#define PACER_BADRINDEX 3
-#define AO_BADRINDEX 4
 /* sizes of io regions */
 #define CONT_STAT_SIZE 10
 #define ADC_FIFO_SIZE 4
@@ -1670,22 +1662,14 @@ static int cb_pcidas_attach(struct comedi_device *dev,
                        "Failed to enable PCI device and request regions\n");
                return -EIO;
        }
-       /*
-        * Initialize devpriv->control_status and devpriv->adc_fifo to point to
-        * their base address.
-        */
-       devpriv->s5933_config =
-           pci_resource_start(devpriv->pci_dev, S5933_BADRINDEX);
-       devpriv->control_status =
-           pci_resource_start(devpriv->pci_dev, CONT_STAT_BADRINDEX);
-       devpriv->adc_fifo =
-           pci_resource_start(devpriv->pci_dev, ADC_FIFO_BADRINDEX);
-       devpriv->pacer_counter_dio =
-           pci_resource_start(devpriv->pci_dev, PACER_BADRINDEX);
-       if (thisboard->ao_nchan) {
-               devpriv->ao_registers =
-                   pci_resource_start(devpriv->pci_dev, AO_BADRINDEX);
-       }
+
+       devpriv->s5933_config = pci_resource_start(devpriv->pci_dev, 0);
+       devpriv->control_status = pci_resource_start(devpriv->pci_dev, 1);
+       devpriv->adc_fifo = pci_resource_start(devpriv->pci_dev, 2);
+       devpriv->pacer_counter_dio = pci_resource_start(devpriv->pci_dev, 3);
+       if (thisboard->ao_nchan)
+               devpriv->ao_registers = pci_resource_start(devpriv->pci_dev, 4);
+
        /*  disable and clear interrupts on amcc s5933 */
        outl(INTCSR_INBOX_INTR_STATUS,
             devpriv->s5933_config + AMCC_OP_REG_INTCSR);