patch-2.4.0-test3 linux/drivers/cdrom/gscd.h

• Lines: 15
• Date: Wed Jul 5 11:24:40 2000
• Orig file: v2.4.0-test2/linux/drivers/cdrom/gscd.h
• Orig date: Tue Dec 2 11:41:44 1997

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/cdrom/gscd.h linux/drivers/cdrom/gscd.h
@@ -74,11 +74,10 @@
 #define READ_DATA(port, buf, nr) insb(port, buf, nr)
 
 #define SET_TIMER(func, jifs) \
-	((timer_table[GSCD_TIMER].expires = jiffies + jifs), \
-	(timer_table[GSCD_TIMER].fn = func), \
-	(timer_active |= 1<<GSCD_TIMER))
+	((mod_timer(&gscd_timer, jiffies + jifs)), \
+	(gscd_timer.function = func))
 
-#define CLEAR_TIMER		timer_active &= ~(1<<GSCD_TIMER)
+#define CLEAR_TIMER		del_timer_sync(&gscd_timer)
 
 #define MAX_TRACKS		104