Skip to content

Commit

Permalink
staging: comedi: cb_pcimdda: remove the DIO_METHODS
Browse files Browse the repository at this point in the history
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: 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 ce774ea commit e070c6a
Showing 1 changed file with 5 additions and 22 deletions.
27 changes: 5 additions & 22 deletions drivers/staging/comedi/drivers/cb_pcimdda.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,20 @@ struct cb_pcimdda_board {
int ao_chans;
int ao_bits;
int dio_chans;
int dio_method;
/* how many bytes into the BADR are the DIO ports */
int dio_offset;
int regs_badrindex; /* IO Region for the control, analog output,
and DIO registers */
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[] = {
{
.name = "cb_pcimdda06-16",
.device_id = PCI_ID_PCIM_DDA06_16,
.ao_chans = 6,
.ao_bits = 16,
.dio_chans = 24,
.dio_method = DIO_8255,
.dio_offset = 12,
.regs_badrindex = 3,
.reg_sz = 16,
Expand Down Expand Up @@ -283,20 +275,11 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
s = dev->subdevices + 1;
/* digital i/o subdevice */
if (thisboard->dio_chans) {
switch (thisboard->dio_method) {
case DIO_8255:
ret = subdev_8255_init(dev, s, NULL,
dev->iobase + thisboard->dio_offset);
if (ret)
return ret;
devpriv->attached_to_8255 = 1;
break;
case DIO_INTERNAL:
default:
printk("DIO_INTERNAL not implemented yet!\n");
return -ENXIO;
break;
}
ret = subdev_8255_init(dev, s, NULL,
dev->iobase + thisboard->dio_offset);
if (ret)
return ret;
devpriv->attached_to_8255 = 1;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
Expand Down

0 comments on commit e070c6a

Please sign in to comment.