Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-19 01:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: adv_pci1724: absorb set_dac()

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2014-11-20 15:10:50 -07:00 committed by Greg Kroah-Hartman
parent e25e22b012
commit 77aa39330a
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/comedi/drivers/adv_pci1724.c
View File

@ -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;
}