patch-2.3.99-pre7 linux/drivers/scsi/NCR5380.c

• Lines: 34
• Date: Wed May 10 16:56:42 2000
• Orig file: v2.3.99-pre6/linux/drivers/scsi/NCR5380.c
• Orig date: Fri Sep 10 23:57:31 1999

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/scsi/NCR5380.c linux/drivers/scsi/NCR5380.c
@@ -563,14 +563,10 @@
 
 static __inline__ void run_main(void)
 {
-	unsigned long flags;
-	save_flags(flags);
-	cli();
 	if (!main_running) {
 		main_running = 1;
 		NCR5380_main();
 	}
-	restore_flags(flags);
 }
 
 #ifdef USLEEP
@@ -667,9 +663,7 @@
 	((struct NCR5380_hostdata *) instance->hostdata)->next_timer = tmp;
 	*prev = instance;
    
-	del_timer(&usleep_timer);
-	usleep_timer.expires = ((struct NCR5380_hostdata *) expires_first->hostdata)->time_expires;
-	add_timer(&usleep_timer);
+	mod_timer(&usleep_timer, ((struct NCR5380_hostdata *) expires_first->hostdata)->time_expires);
 	restore_flags(flags);
 	return 0;
 }
@@ -1226,7 +1220,6 @@
 	 * sense data is only guaranteed to be valid while the condition exists.
 	 */
 
-	cli();
 	if (!(hostdata->issue_queue) || (cmd->cmnd[0] == REQUEST_SENSE)) {
 		LIST(cmd, hostdata->issue_queue);
 		cmd->host_scribble = (unsigned char *) hostdata->issue_queue;