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

staging: comedi: amplc_dio200: absorb dio200_subdev_timer_init()

This function is only called by amplc_dio200_common_attach() and it
can never fail. For aesthetics, absorb it into that 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 c3f6aa33
...@@ -979,18 +979,6 @@ static int dio200_subdev_timer_config(struct comedi_device *dev, ...@@ -979,18 +979,6 @@ static int dio200_subdev_timer_config(struct comedi_device *dev,
return ret < 0 ? ret : insn->n; return ret < 0 ? ret : insn->n;
} }
static int dio200_subdev_timer_init(struct comedi_device *dev,
struct comedi_subdevice *s)
{
s->type = COMEDI_SUBD_TIMER;
s->subdev_flags = SDF_READABLE | SDF_LSAMPL;
s->n_chan = 1;
s->maxdata = 0xFFFFFFFF;
s->insn_read = dio200_subdev_timer_read;
s->insn_config = dio200_subdev_timer_config;
return 0;
}
void amplc_dio200_set_enhance(struct comedi_device *dev, unsigned char val) void amplc_dio200_set_enhance(struct comedi_device *dev, unsigned char val)
{ {
dio200_write8(dev, DIO200_ENHANCE, val); dio200_write8(dev, DIO200_ENHANCE, val);
...@@ -1040,9 +1028,12 @@ int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq, ...@@ -1040,9 +1028,12 @@ int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq,
} }
break; break;
case sd_timer: case sd_timer:
ret = dio200_subdev_timer_init(dev, s); s->type = COMEDI_SUBD_TIMER;
if (ret < 0) s->subdev_flags = SDF_READABLE | SDF_LSAMPL;
return ret; s->n_chan = 1;
s->maxdata = 0xffffffff;
s->insn_read = dio200_subdev_timer_read;
s->insn_config = dio200_subdev_timer_config;
break; break;
default: default:
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
......
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