[PATCH 035/108] staging: comedi: addi_apci_3120: remove APCI3120_DISABLE_WATCHDOG

H Hartley Sweeten hsweeten at visionengravers.com
Tue Nov 4 17:54:19 UTC 2014


For aesthetics, remove this define and just use ~APCI3120_ENABLE_WATCHDOG.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 3eb53f1..f6812ea 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -113,7 +113,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 #define APCI3120_RD_STATUS		0x02
 #define APCI3120_ENABLE_WATCHDOG	0x20
-#define APCI3120_DISABLE_WATCHDOG	(~APCI3120_ENABLE_WATCHDOG)
 #define APCI3120_ENABLE_TIMER_COUNTER	0x10
 #define APCI3120_FC_TIMER		0x1000
 
@@ -1195,7 +1194,7 @@ static int apci3120_write_insn_timer(struct comedi_device *dev,
 			devpriv->mode &= ~APCI3120_ENABLE_TIMER_COUNTER;
 		} else {
 			/* Disable WatchDog */
-			devpriv->mode &= APCI3120_DISABLE_WATCHDOG;
+			devpriv->mode &= ~APCI3120_ENABLE_WATCHDOG;
 		}
 		/*  Disable timer interrupt */
 		devpriv->mode &= APCI3120_DISABLE_TIMER_INT;
-- 
2.0.3



More information about the devel mailing list