patch-2.3.1 linux/drivers/char/rtc.c

• Lines: 26
• Date: Tue May 11 14:37:40 1999
• Orig file: v2.3.0/linux/drivers/char/rtc.c
• Orig date: Thu Jan 14 22:58:47 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/char/rtc.c linux/drivers/char/rtc.c
@@ -69,7 +69,7 @@
  *	ioctls.
  */
 
-static struct wait_queue *rtc_wait;
+static DECLARE_WAIT_QUEUE_HEAD(rtc_wait);
 
 static struct timer_list rtc_irq_timer;
 
@@ -150,7 +150,7 @@
 static ssize_t rtc_read(struct file *file, char *buf,
 			size_t count, loff_t *ppos)
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	unsigned long data;
 	ssize_t retval;
 	
@@ -567,7 +567,6 @@
 #endif
 	init_timer(&rtc_irq_timer);
 	rtc_irq_timer.function = rtc_dropped_irq;
-	rtc_wait = NULL;
 	save_flags(flags);
 	cli();
 	/* Initialize periodic freq. to CMOS reset default, which is 1024Hz */