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

staging: comedi: cb_pcimdda: remove dio_offset from the boardinfo

The 8255 device is located at a fixed offset from the base
address of the card. There is not need to carry this offset
in the boardinfo. Remove it.
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 d9e33afb
...@@ -107,8 +107,6 @@ struct cb_pcimdda_board { ...@@ -107,8 +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;
/* how many bytes into the BADR are the DIO ports */
int dio_offset;
int regs_badrindex; /* IO Region for the control, analog output, int regs_badrindex; /* IO Region for the control, analog output,
and DIO registers */ and DIO registers */
int reg_sz; /* number of bytes of registers in io region */ int reg_sz; /* number of bytes of registers in io region */
...@@ -120,7 +118,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = { ...@@ -120,7 +118,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,
.dio_offset = 12,
.regs_badrindex = 3, .regs_badrindex = 3,
.reg_sz = 16, .reg_sz = 16,
} }
...@@ -279,7 +276,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev, ...@@ -279,7 +276,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
s = dev->subdevices + 1; s = dev->subdevices + 1;
/* digital i/o subdevice */ /* digital i/o subdevice */
ret = subdev_8255_init(dev, s, NULL, ret = subdev_8255_init(dev, s, NULL,
dev->iobase + thisboard->dio_offset); dev->iobase + PCIMDDA_8255_BASE_REG);
if (ret) if (ret)
return ret; return ret;
devpriv->attached_to_8255 = 1; devpriv->attached_to_8255 = 1;
......
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