Skip to content

Commit

Permalink
staging: comedi: cb_pcimdda: remove regs_badrindex and reg_sz from bo…
Browse files Browse the repository at this point in the history
…ardinfo

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Aug 17, 2012
1 parent 08c3c40 commit c8dd8e9
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/staging/comedi/drivers/cb_pcimdda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand All @@ -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,
}
};

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit c8dd8e9

Please sign in to comment.