diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-06-20 13:12:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 20:08:20 -0400 |
| commit | 9803bc096910ce4f012699d4dae07d91346c6d66 (patch) | |
| tree | 8b879da7cecd98d480901d738e4f27c354ed6e38 /drivers/staging/comedi/drivers/dt282x.c | |
| parent | f8b987b4d35c37cf973c30871fc42b16c6272041 (diff) | |
staging: comedi: dt282x: tidy up Analog Output subdevice init
For aesthetics, add some whitespace to the Analog Output subdevice init.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/dt282x.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/dt282x.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index 326924fcf90b..c26ae86b3e2a 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c @@ -1236,31 +1236,33 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->cancel = dt282x_ai_cancel; } + /* Analog Output subdevice */ s = &dev->subdevices[1]; + if (board->dachan) { + s->type = COMEDI_SUBD_AO; + s->subdev_flags = SDF_WRITABLE; + s->n_chan = board->dachan; + s->maxdata = board->ao_maxdata; - s->n_chan = board->dachan; - if (s->n_chan) { - /* ao subsystem */ - s->type = COMEDI_SUBD_AO; - s->subdev_flags = SDF_WRITABLE; - s->insn_read = dt282x_ao_insn_read; - s->insn_write = dt282x_ao_insn_write; - s->maxdata = board->ao_maxdata; + /* ranges are per-channel, set by jumpers on the board */ s->range_table_list = devpriv->darangelist; devpriv->darangelist[0] = opt_ao_range_lkup(it->options[9]); devpriv->darangelist[1] = opt_ao_range_lkup(it->options[10]); devpriv->da0_2scomp = it->options[6] ? 1 : 0; devpriv->da1_2scomp = it->options[7] ? 1 : 0; + + s->insn_read = dt282x_ao_insn_read; + s->insn_write = dt282x_ao_insn_write; if (dev->irq) { dev->write_subdev = s; - s->subdev_flags |= SDF_CMD_WRITE; - s->len_chanlist = 2; - s->do_cmdtest = dt282x_ao_cmdtest; - s->do_cmd = dt282x_ao_cmd; - s->cancel = dt282x_ao_cancel; + s->subdev_flags |= SDF_CMD_WRITE; + s->len_chanlist = s->n_chan; + s->do_cmdtest = dt282x_ao_cmdtest; + s->do_cmd = dt282x_ao_cmd; + s->cancel = dt282x_ao_cancel; } } else { - s->type = COMEDI_SUBD_UNUSED; + s->type = COMEDI_SUBD_UNUSED; } /* Digital I/O subdevice */ |