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

staging: comedi: c6xdigio: tidy up subdevice 0 init

This subdevice is a PWM output not and analog output, fix the 'type'.

Fix the subdevice 'range', range_bipolar does not make sense for a PWM
output. The range_unknown is a better choice.

Remove the commented out init of the 'trig'.

For aesthetics, add some whitespace to the init and rename the 'insn_write'
function.
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 28c2c50c
...@@ -172,10 +172,10 @@ static void c6xdigio_encoder_reset(struct comedi_device *dev) ...@@ -172,10 +172,10 @@ static void c6xdigio_encoder_reset(struct comedi_device *dev)
c6xdigio_write_data(dev, 0x00, 0x80); c6xdigio_write_data(dev, 0x00, 0x80);
} }
static int c6xdigio_pwmo_insn_write(struct comedi_device *dev, static int c6xdigio_pwm_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
unsigned int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
int i; int i;
...@@ -238,13 +238,12 @@ static int c6xdigio_attach(struct comedi_device *dev, ...@@ -238,13 +238,12 @@ static int c6xdigio_attach(struct comedi_device *dev,
s = &dev->subdevices[0]; s = &dev->subdevices[0];
/* pwm output subdevice */ /* pwm output subdevice */
s->type = COMEDI_SUBD_AO; /* Not sure what to put here */ s->type = COMEDI_SUBD_PWM;
s->subdev_flags = SDF_WRITEABLE; s->subdev_flags = SDF_WRITEABLE;
s->n_chan = 2; s->n_chan = 2;
/* s->trig[0] = c6xdigio_pwmo; */ s->maxdata = 500;
s->insn_write = c6xdigio_pwmo_insn_write; s->range_table = &range_unknown;
s->maxdata = 500; s->insn_write = c6xdigio_pwm_insn_write;
s->range_table = &range_bipolar10; /* A suitable lie */
s = &dev->subdevices[1]; s = &dev->subdevices[1];
/* encoder (counter) subdevice */ /* encoder (counter) subdevice */
......
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