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

staging: comedi: pcl711: tidy up the subdevice init

For aesthetic reasons, add some whitespace to the subdevice init.

The 's->len_chanlist' is only used with asynchronous command support.
Remove the unnecessary initialization of this member in the subdevices
that do not support commands. For the analog input subdevice, move
the initialization so it only occurs when commands are supported.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95bb9414
...@@ -496,52 +496,48 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -496,52 +496,48 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!devpriv) if (!devpriv)
return -ENOMEM; return -ENOMEM;
/* Analog Input subdevice */
s = &dev->subdevices[0]; s = &dev->subdevices[0];
/* AI subdevice */
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_GROUND; s->subdev_flags = SDF_READABLE | SDF_GROUND;
s->n_chan = board->n_aichan; s->n_chan = board->n_aichan;
s->maxdata = 0xfff; s->maxdata = 0xfff;
s->len_chanlist = 1;
s->range_table = board->ai_range_type; s->range_table = board->ai_range_type;
s->insn_read = pcl711_ai_insn; s->insn_read = pcl711_ai_insn;
if (dev->irq) { if (dev->irq) {
dev->read_subdev = s; dev->read_subdev = s;
s->subdev_flags |= SDF_CMD_READ; s->subdev_flags |= SDF_CMD_READ;
s->len_chanlist = 1;
s->do_cmdtest = pcl711_ai_cmdtest; s->do_cmdtest = pcl711_ai_cmdtest;
s->do_cmd = pcl711_ai_cmd; s->do_cmd = pcl711_ai_cmd;
} }
/* Analog Output subdevice */
s = &dev->subdevices[1]; s = &dev->subdevices[1];
/* AO subdevice */
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE; s->subdev_flags = SDF_WRITABLE;
s->n_chan = board->n_aochan; s->n_chan = board->n_aochan;
s->maxdata = 0xfff; s->maxdata = 0xfff;
s->len_chanlist = 1;
s->range_table = &range_bipolar5; s->range_table = &range_bipolar5;
s->insn_write = pcl711_ao_insn; s->insn_write = pcl711_ao_insn;
s->insn_read = pcl711_ao_insn_read; s->insn_read = pcl711_ao_insn_read;
/* Digital Input subdevice */
s = &dev->subdevices[2]; s = &dev->subdevices[2];
/* 16-bit digital input */
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
s->n_chan = 16; s->n_chan = 16;
s->maxdata = 1; s->maxdata = 1;
s->len_chanlist = 16;
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_bits = pcl711_di_insn_bits; s->insn_bits = pcl711_di_insn_bits;
/* Digital Output subdevice */
s = &dev->subdevices[3]; s = &dev->subdevices[3];
/* 16-bit digital out */
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE; s->subdev_flags = SDF_WRITABLE;
s->n_chan = 16; s->n_chan = 16;
s->maxdata = 1; s->maxdata = 1;
s->len_chanlist = 16;
s->range_table = &range_digital; s->range_table = &range_digital;
s->state = 0;
s->insn_bits = pcl711_do_insn_bits; s->insn_bits = pcl711_do_insn_bits;
/* /*
......
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