staging: comedi: hwdrv_apci3501: remove useless read/mask to stop watchdog
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 12 Aug 2015 20:25:36 +0000 (13:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Aug 2015 01:36:16 +0000 (18:36 -0700)
The watchdog is stopped in apci3501_write_insn_timer() by writing a 0 to
the timer control register. There is no need to read the register first
and mask it (as done when the timer is used as a timer).

Reported-by: coverity (CID 1227052)
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>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c

index 1f2f78186d58c1545946e80b3cf0fd371974b9e9..e12b2bc61ca317bf99575c8d8f42dfbd7d8278cb 100644 (file)
@@ -102,8 +102,6 @@ static int apci3501_write_insn_timer(struct comedi_device *dev,
                        /* Enable the Watchdog */
                        outl(ul_Command1, dev->iobase + APCI3501_TIMER_CTRL_REG);
                } else if (data[1] == 0) { /* Stop The Watchdog */
-                       ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);
-                       ul_Command1 = ul_Command1 & 0xFFFFF9FEUL;
                        outl(0x0, dev->iobase + APCI3501_TIMER_CTRL_REG);
                } else if (data[1] == 2) {
                        ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG);