leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: hwdrv_apci3501: refactor apci3501_write_insn_timer()

Browse Source 
The handling of the ADDIDATA_WATCHDOG and ADDIDATA_TIMER is identical
except for the "stop" operation. Refactor this function to use a common
code path for both timer modes.

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 2015-08-12 13:25:39 -07:00 committed by Greg Kroah-Hartman
parent e078d25639
commit 626bb280d0
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
View File

@ -92,46 +92,24 @@ static int apci3501_write_insn_timer(struct comedi_device *dev,
unsigned int *data) unsigned int *data)
{ {
struct apci3501_private *devpriv = dev->private; struct apci3501_private *devpriv = dev->private;
unsigned int ctrl = 0; unsigned int ctrl;
if (devpriv->timer_mode == ADDIDATA_WATCHDOG) { if (devpriv->timer_mode == ADDIDATA_WATCHDOG ||
if (data[1] == 1) { devpriv->timer_mode == ADDIDATA_TIMER) {
ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
ctrl &= 0xfffff9ff; ctrl &= 0xfffff9ff;
if (data[1] == 1) { /* enable */
ctrl |= 0x1; ctrl |= 0x1;
/* Enable the Watchdog */ } else if (data[1] == 0) { /* stop */
outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG); if (devpriv->timer_mode == ADDIDATA_WATCHDOG)
} else if (data[1] == 0) { /* Stop The Watchdog */ ctrl = 0;
outl(0x0, dev->iobase + APCI3501_TIMER_CTRL_REG); else
} else if (data[1] == 2) { ctrl &= ~0x1;
ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); } else if (data[1] == 2) { /* trigger */
ctrl &= 0xfffff9ff;
ctrl |= 0x200; ctrl |= 0x200;
outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG);
}
}
if (devpriv->timer_mode == ADDIDATA_TIMER) {
if (data[1] == 1) {
ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
ctrl &= 0xfffff9ff;
ctrl |= 0x1;
/* Enable the Timer */
outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG);
} else if (data[1] == 0) {
/* Stop The Timer */
ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
ctrl &= 0xfffff9fe;
outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG);
}
else if (data[1] == 2) {
/* Trigger the Timer */
ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
ctrl &= 0xfffff9ff;
ctrl |= 0x200;
outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG);
} }
outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG);
} }
inl(dev->iobase + APCI3501_TIMER_STATUS_REG); inl(dev->iobase + APCI3501_TIMER_STATUS_REG);