Absorb this simple function into adv_pci1724_insn_write().
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/drivers/adv_pci1724.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c
b/drivers/staging/comedi/drivers/adv_pci1724.c
index c19d359..2634135 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;
}
--
2.0.3
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
