staging: comedi: cb_pcimdda: remove regs_badrindex and reg_sz from boardinfo
authorH Hartley Sweeten <hartleys@visionengravers.com>
Fri, 17 Aug 2012 02:51:58 +0000 (19:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Aug 2012 15:17:35 +0000 (08:17 -0700)
The base address of the card is always found in pci resource 3. There is
no need to carry this information in the boardinfo. The reg_sz is not
used in the driver. Remove them.

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_pcimdda.c

index ecad85bd0d63cc40d17ac5a0ef67d7c3b3a8566d..0e346035d0700d9a917d64df9694605a73dcad5a 100644 (file)
@@ -107,9 +107,6 @@ struct cb_pcimdda_board {
        unsigned short device_id;
        int ao_chans;
        int ao_bits;
-       int regs_badrindex;     /* IO Region for the control, analog output,
-                                  and DIO registers */
-       int reg_sz;             /* number of bytes of registers in io region */
 };
 
 static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
@@ -118,8 +115,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
         .device_id = PCI_ID_PCIM_DDA06_16,
         .ao_chans = 6,
         .ao_bits = 16,
-        .regs_badrindex = 3,
-        .reg_sz = 16,
         }
 };
 
@@ -252,7 +247,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
        ret = comedi_pci_enable(pcidev, dev->board_name);
        if (ret)
                return ret;
-       dev->iobase = pci_resource_start(pcidev, thisboard->regs_badrindex);
+       dev->iobase = pci_resource_start(pcidev, 3);
 
        ret = comedi_alloc_subdevices(dev, 2);
        if (ret)