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

staging: comedi: cb_pcimdda: remove the DIO_METHODS

The digital i/o on this card is handled by an 8255 compatible
device. There are not other options. Remove the DIO_METHODS
enum as well as the dio_method variable in the boardinfo and
the code dealing with 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 ce774eab
...@@ -102,7 +102,6 @@ struct cb_pcimdda_board { ...@@ -102,7 +102,6 @@ struct cb_pcimdda_board {
int ao_chans; int ao_chans;
int ao_bits; int ao_bits;
int dio_chans; int dio_chans;
int dio_method;
/* how many bytes into the BADR are the DIO ports */ /* how many bytes into the BADR are the DIO ports */
int dio_offset; int dio_offset;
int regs_badrindex; /* IO Region for the control, analog output, int regs_badrindex; /* IO Region for the control, analog output,
...@@ -110,12 +109,6 @@ struct cb_pcimdda_board { ...@@ -110,12 +109,6 @@ struct cb_pcimdda_board {
int reg_sz; /* number of bytes of registers in io region */ int reg_sz; /* number of bytes of registers in io region */
}; };
enum DIO_METHODS {
DIO_NONE = 0,
DIO_8255,
DIO_INTERNAL /* unimplemented */
};
static const struct cb_pcimdda_board cb_pcimdda_boards[] = { static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
{ {
.name = "cb_pcimdda06-16", .name = "cb_pcimdda06-16",
...@@ -123,7 +116,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = { ...@@ -123,7 +116,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
.ao_chans = 6, .ao_chans = 6,
.ao_bits = 16, .ao_bits = 16,
.dio_chans = 24, .dio_chans = 24,
.dio_method = DIO_8255,
.dio_offset = 12, .dio_offset = 12,
.regs_badrindex = 3, .regs_badrindex = 3,
.reg_sz = 16, .reg_sz = 16,
...@@ -283,20 +275,11 @@ static int cb_pcimdda_attach(struct comedi_device *dev, ...@@ -283,20 +275,11 @@ 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 */
if (thisboard->dio_chans) { if (thisboard->dio_chans) {
switch (thisboard->dio_method) { ret = subdev_8255_init(dev, s, NULL,
case DIO_8255: dev->iobase + thisboard->dio_offset);
ret = subdev_8255_init(dev, s, NULL, if (ret)
dev->iobase + thisboard->dio_offset); return ret;
if (ret) devpriv->attached_to_8255 = 1;
return ret;
devpriv->attached_to_8255 = 1;
break;
case DIO_INTERNAL:
default:
printk("DIO_INTERNAL not implemented yet!\n");
return -ENXIO;
break;
}
} else { } else {
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
......
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