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

Next file: linux/drivers/char/sbc60xxwdt.c
Previous file: linux/drivers/char/rocket.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/rtc.c linux/drivers/char/rtc.c
@@ -179,8 +179,7 @@
 	/* Now do the rest of the actions */
 	wake_up_interruptible(&rtc_wait);	
 
-	if (rtc_async_queue)
-		kill_fasync (rtc_async_queue, SIGIO, POLL_IN);
+	kill_fasync (&rtc_async_queue, SIGIO, POLL_IN);
 }
 #endif
 
@@ -514,8 +513,6 @@
 	if(rtc_status & RTC_IS_OPEN)
 		return -EBUSY;
 
-	MOD_INC_USE_COUNT;
-
 	rtc_status |= RTC_IS_OPEN;
 
 	spin_lock_irq (&rtc_lock);
@@ -559,7 +556,6 @@
 	}
 
 #endif
-	MOD_DEC_USE_COUNT;
 
 	spin_lock_irq (&rtc_lock);
 	rtc_irq_data = 0;
@@ -591,6 +587,7 @@
  */
 
 static struct file_operations rtc_fops = {
+	owner:		THIS_MODULE,
 	llseek:		rtc_llseek,
 	read:		rtc_read,
 #ifndef __alpha__
@@ -781,8 +778,7 @@
 	/* Now we have new data */
 	wake_up_interruptible(&rtc_wait);
 
-	if (rtc_async_queue)
-		kill_fasync (rtc_async_queue, SIGIO, POLL_IN);
+	kill_fasync (&rtc_async_queue, SIGIO, POLL_IN);
 }
 #endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)