patch-2.4.0-test10 linux/drivers/char/rtc.c

• Lines: 31
• Date: Thu Oct 12 11:16:26 2000
• Orig file: v2.4.0-test9/linux/drivers/char/rtc.c
• Orig date: Sun Oct 8 10:50:17 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/char/rtc.c linux/drivers/char/rtc.c
@@ -39,9 +39,10 @@
  *	1.10a	Andrea Arcangeli: Alpha updates
  *	1.10b	Andrew Morton: SMP lock fix
  *	1.10c	Cesar Barros: SMP locking fixes and cleanup
+ *	1.10d	Paul Gortmaker: delete paranoia check in rtc_exit
  */
 
-#define RTC_VERSION		"1.10c"
+#define RTC_VERSION		"1.10d"
 
 #define RTC_IO_EXTENT	0x10	/* Only really two ports, but...	*/
 
@@ -723,18 +724,6 @@
 
 static void __exit rtc_exit (void)
 {
-	/* interrupts and maybe timer disabled at this point by rtc_release */
-	/* FIXME: Maybe??? */
-
-	if (rtc_status & RTC_TIMER_ON) {
-		spin_lock_irq (&rtc_lock);
-		rtc_status &= ~RTC_TIMER_ON;
-		del_timer(&rtc_irq_timer);
-		spin_unlock_irq (&rtc_lock);
-
-		printk(KERN_WARNING "rtc_exit(), and timer still running.\n");
-	}
-
 	remove_proc_entry ("driver/rtc", NULL);
 	misc_deregister(&rtc_dev);