diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-20 15:10:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 15:36:40 -0800 |
| commit | 77aa39330aa1085b1cd877a0211cefc69b34d339 (patch) | |
| tree | 23309c04d1338adbb93a57e19672d6cbc66948b6 /drivers | |
| parent | e25e22b01203f6588b0124cc2d3d45756d6de59f (diff) | |
staging: comedi: adv_pci1724: absorb set_dac()
Absorb this simple function into adv_pci1724_insn_write().
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')
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1724.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c index c19d35908e6c..26341358458f 100644 --- a/drivers/staging/comedi/drivers/adv_pci1724.c +++ b/drivers/staging/comedi/drivers/adv_pci1724.c @@ -135,18 +135,6 @@ static int adv_pci1724_dac_idle(struct comedi_device *dev, return -EBUSY; } -static int set_dac(struct comedi_device *dev, unsigned mode, unsigned channel, - unsigned data) -{ - unsigned control_bits; - - control_bits = mode; - control_bits |= dac_channel_and_group_select_bits(channel); - control_bits |= dac_data_bits(data); - outl(control_bits, dev->iobase + DAC_CONTROL_REG); - return 0; -} - static int adv_pci1724_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, @@ -162,14 +150,16 @@ static int adv_pci1724_insn_write(struct comedi_device *dev, for (i = 0; i < insn->n; ++i) { unsigned int val = data[i]; + unsigned int ctrl; ret = comedi_timeout(dev, s, insn, adv_pci1724_dac_idle, 0); if (ret) return ret; - ret = set_dac(dev, mode, chan, val); - if (ret < 0) - return ret; + ctrl = mode; + ctrl |= dac_channel_and_group_select_bits(chan); + ctrl |= dac_data_bits(val); + outl(ctrl, dev->iobase + DAC_CONTROL_REG); s->readback[chan] = val; } |