Commit c8dd8e93 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: cb_pcimdda: remove regs_badrindex and reg_sz from boardinfo

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08c3c407
...@@ -107,9 +107,6 @@ struct cb_pcimdda_board { ...@@ -107,9 +107,6 @@ struct cb_pcimdda_board {
unsigned short device_id; unsigned short device_id;
int ao_chans; int ao_chans;
int ao_bits; 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[] = { static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
...@@ -118,8 +115,6 @@ 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, .device_id = PCI_ID_PCIM_DDA06_16,
.ao_chans = 6, .ao_chans = 6,
.ao_bits = 16, .ao_bits = 16,
.regs_badrindex = 3,
.reg_sz = 16,
} }
}; };
...@@ -252,7 +247,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev, ...@@ -252,7 +247,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
ret = comedi_pci_enable(pcidev, dev->board_name); ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret) if (ret)
return 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); ret = comedi_alloc_subdevices(dev, 2);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment