patch-2.4.0-test3 linux/drivers/scsi/gdth_proc.c

• Lines: 26
• Date: Wed Jul 5 11:24:41 2000
• Orig file: v2.4.0-test2/linux/drivers/scsi/gdth_proc.c
• Orig date: Fri Jan 28 15:09:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/scsi/gdth_proc.c linux/drivers/scsi/gdth_proc.c
@@ -1057,7 +1057,6 @@
     oldto = scp->timeout_per_command;
     scp->timeout_per_command = timeout;
 
-#if LINUX_VERSION_CODE >= 0x02014B
     if (timeout == 0) {
         del_timer(&scp->eh_timeout);
         scp->eh_timeout.data = (unsigned long) NULL;
@@ -1069,17 +1068,5 @@
         scp->eh_timeout.expires = jiffies + timeout;
         add_timer(&scp->eh_timeout);
     }
-#else
-    if (timeout > 0) {
-        if (timer_table[SCSI_TIMER].expires == 0) {
-            timer_table[SCSI_TIMER].expires = jiffies + timeout;
-            timer_active |= 1 << SCSI_TIMER;
-        } else {
-            if (jiffies + timeout < timer_table[SCSI_TIMER].expires)
-                timer_table[SCSI_TIMER].expires = jiffies + timeout;
-        }
-    }
-#endif
-
     return oldto;
 }