patch-2.4.22 linux-2.4.22/drivers/scsi/pcmcia/nsp_cs.c
Next file: linux-2.4.22/drivers/scsi/pcmcia/qlogic_stub.c
Previous file: linux-2.4.22/drivers/scsi/pcmcia/fdomain_stub.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/scsi/pcmcia/nsp_cs.c
- Orig date:
2003-06-13 07:51:36.000000000 -0700
diff -urN linux-2.4.21/drivers/scsi/pcmcia/nsp_cs.c linux-2.4.22/drivers/scsi/pcmcia/nsp_cs.c
@@ -36,7 +36,6 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/string.h>
-#include <linux/timer.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/tqueue.h>
@@ -1341,10 +1340,6 @@
link = &info->link;
link->priv = info;
- /* Initialize the dev_link_t structure */
- link->release.function = &nsp_cs_release;
- link->release.data = (u_long)link;
-
/* The io structure describes IO port mapping */
link->io.NumPorts1 = 0x10;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -1415,7 +1410,6 @@
return;
}
- del_timer(&link->release);
if (link->state & DEV_CONFIG) {
nsp_cs_release((u_long)link);
if (link->state & DEV_STALE_CONFIG) {
@@ -1660,7 +1654,7 @@
link->state &= ~DEV_PRESENT;
if (link->state & DEV_CONFIG) {
((scsi_info_t *)link->priv)->stop = 1;
- mod_timer(&link->release, jiffies + HZ/20);
+ nsp_cs_release((u_long)link);
}
break;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)