diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/pcl726.c')
-rw-r--r-- | drivers/staging/comedi/drivers/pcl726.c | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c index 74f6489bd124..dc179bd02dfd 100644 --- a/drivers/staging/comedi/drivers/pcl726.c +++ b/drivers/staging/comedi/drivers/pcl726.c @@ -156,7 +156,6 @@ static const struct pcl726_board pcl726_boards[] = { struct pcl726_private { const struct comedi_lrange *rangelist[12]; - unsigned int ao_readback[12]; unsigned int cmd_running:1; }; @@ -189,9 +188,6 @@ static int pcl726_intr_cmdtest(struct comedi_device *dev, /* Step 2a : make sure trigger sources are unique */ /* Step 2b : and mutually compatible */ - if (err) - return 2; - /* Step 3: check if arguments are trivially valid */ err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0); @@ -203,10 +199,9 @@ static int pcl726_intr_cmdtest(struct comedi_device *dev, if (err) return 3; - /* step 4: ignored */ + /* Step 4: fix up any arguments */ - if (err) - return 4; + /* Step 5: check channel list if it exists */ return 0; } @@ -253,15 +248,14 @@ static int pcl726_ao_insn_write(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - struct pcl726_private *devpriv = dev->private; unsigned int chan = CR_CHAN(insn->chanspec); unsigned int range = CR_RANGE(insn->chanspec); - unsigned int val; int i; for (i = 0; i < insn->n; i++) { - val = data[i]; - devpriv->ao_readback[chan] = val; + unsigned int val = data[i]; + + s->readback[chan] = val; /* bipolar data to the DAC is two's complement */ if (comedi_chan_range_is_bipolar(s, chan, range)) @@ -275,27 +269,12 @@ static int pcl726_ao_insn_write(struct comedi_device *dev, return insn->n; } -static int pcl726_ao_insn_read(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, - unsigned int *data) -{ - struct pcl726_private *devpriv = dev->private; - unsigned int chan = CR_CHAN(insn->chanspec); - int i; - - for (i = 0; i < insn->n; i++) - data[i] = devpriv->ao_readback[chan]; - - return insn->n; -} - static int pcl726_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - const struct pcl726_board *board = comedi_board(dev); + const struct pcl726_board *board = dev->board_ptr; unsigned int val; if (board->is_pcl727) { @@ -316,7 +295,7 @@ static int pcl726_do_insn_bits(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - const struct pcl726_board *board = comedi_board(dev); + const struct pcl726_board *board = dev->board_ptr; unsigned long io = dev->iobase; unsigned int mask; @@ -343,7 +322,7 @@ static int pcl726_do_insn_bits(struct comedi_device *dev, static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - const struct pcl726_board *board = comedi_board(dev); + const struct pcl726_board *board = dev->board_ptr; struct pcl726_private *devpriv; struct comedi_subdevice *s; int subdev; @@ -398,7 +377,11 @@ static int pcl726_attach(struct comedi_device *dev, s->maxdata = 0x0fff; s->range_table_list = devpriv->rangelist; s->insn_write = pcl726_ao_insn_write; - s->insn_read = pcl726_ao_insn_read; + s->insn_read = comedi_readback_insn_read; + + ret = comedi_alloc_subdev_readback(s); + if (ret) + return ret; if (board->have_dio) { /* Digital Input subdevice */ |