patch-2.2.0-pre2 linux/drivers/block/acsi_slm.c

• Lines: 20
• Date: Tue Dec 29 11:23:59 1998
• Orig file: v2.2.0-pre1/linux/drivers/block/acsi_slm.c
• Orig date: Wed Aug 26 11:37:34 1998

diff -u --recursive --new-file v2.2.0-pre1/linux/drivers/block/acsi_slm.c linux/drivers/block/acsi_slm.c
@@ -101,17 +101,8 @@
 		cmd[1] = (cmd[1] & ~0xe0) | (lun)<<5;	\
 	} while(0)
 
-#define	START_TIMER(to)							\
-    do {										\
-        del_timer( &slm_timer );				\
-        slm_timer.expires = jiffies + (to);			\
-        add_timer( &slm_timer );				\
-	} while(0)
-
-#define	STOP_TIMER()							\
-    do {										\
-        del_timer( &slm_timer );				\
-	} while(0)
+#define	START_TIMER(to)	mod_timer(&slm_timer, jiffies + (to))
+#define	STOP_TIMER()	del_timer(&slm_timer)
 
 
 static char slmreqsense_cmd[6] = { 0x03, 0, 0, 0, 0, 0 };