Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia

into home.osdl.org:/home/torvalds/v2.5/linux

4 files changed, 20 insertions, 44 deletions

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 10dc1e6704b4..fee12e3828cf 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -90,7 +90,7 @@ typedef struct bluecard_info_t {
 
 
 void bluecard_config(dev_link_t *link);
-void bluecard_release(u_long arg);
+void bluecard_release(dev_link_t *link);
 int bluecard_event(event_t event, int priority, event_callback_args_t *args);
 
 static dev_info_t dev_info = "bluecard_cs";
@@ -838,9 +838,6 @@ dev_link_t *bluecard_attach(void)
 	link = &info->link;
 	link->priv = info;
 
-	init_timer(&link->release);
-	link->release.function = &bluecard_release;
-	link->release.data = (u_long)link;
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
 	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
@@ -897,9 +894,8 @@ void bluecard_detach(dev_link_t *link)
 	if (*linkp == NULL)
 		return;
 
-	del_timer(&link->release);
 	if (link->state & DEV_CONFIG)
-		bluecard_release((u_long)link);
+		bluecard_release(link);
 
 	if (link->handle) {
 		ret = CardServices(DeregisterClient, link->handle);
@@ -1004,13 +1000,12 @@ cs_failed:
 	cs_error(link->handle, last_fn, last_ret);
 
 failed:
-	bluecard_release((u_long)link);
+	bluecard_release(link);
 }
 
 
-void bluecard_release(u_long arg)
+void bluecard_release(dev_link_t *link)
 {
-	dev_link_t *link = (dev_link_t *)arg;
 	bluecard_info_t *info = link->priv;
 
 	if (link->state & DEV_PRESENT)
@@ -1036,7 +1031,7 @@ int bluecard_event(event_t event, int priority, event_callback_args_t *args)
 		link->state &= ~DEV_PRESENT;
 		if (link->state & DEV_CONFIG) {
 			bluecard_close(info);
-			mod_timer(&link->release, jiffies + HZ / 20);
+			bluecard_release(link);
 		}
 		break;
 	case CS_EVENT_CARD_INSERTION:
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index fcf4c16ba2dc..b5a8135f9808 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -30,7 +30,6 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/timer.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
@@ -94,7 +93,7 @@ typedef struct bt3c_info_t {
 
 
 void bt3c_config(dev_link_t *link);
-void bt3c_release(u_long arg);
+void bt3c_release(dev_link_t *link);
 int bt3c_event(event_t event, int priority, event_callback_args_t *args);
 
 static dev_info_t dev_info = "bt3c_cs";
@@ -585,9 +584,6 @@ dev_link_t *bt3c_attach(void)
 	link = &info->link;
 	link->priv = info;
 
-	init_timer(&link->release);
-	link->release.function = &bt3c_release;
-	link->release.data = (u_long)link;
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
 	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
@@ -644,10 +640,8 @@ void bt3c_detach(dev_link_t *link)
 	if (*linkp == NULL)
 		return;
 
-	del_timer(&link->release);
-
 	if (link->state & DEV_CONFIG)
-		bt3c_release((u_long)link);
+		bt3c_release(link);
 
 	if (link->handle) {
 		ret = CardServices(DeregisterClient, link->handle);
@@ -790,13 +784,12 @@ cs_failed:
 	cs_error(link->handle, last_fn, last_ret);
 
 failed:
-	bt3c_release((u_long)link);
+	bt3c_release(link);
 }
 
 
-void bt3c_release(u_long arg)
+void bt3c_release(dev_link_t *link)
 {
-	dev_link_t *link = (dev_link_t *)arg;
 	bt3c_info_t *info = link->priv;
 
 	if (link->state & DEV_PRESENT)
@@ -822,7 +815,7 @@ int bt3c_event(event_t event, int priority, event_callback_args_t *args)
 		link->state &= ~DEV_PRESENT;
 		if (link->state & DEV_CONFIG) {
 			bt3c_close(info);
-			mod_timer(&link->release, jiffies + HZ / 20);
+			bt3c_release(link);
 		}
 		break;
 	case CS_EVENT_CARD_INSERTION:
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 3bdb0dc71d7f..8fb7b29fdc3d 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/timer.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
@@ -92,7 +91,7 @@ typedef struct btuart_info_t {
 
 
 void btuart_config(dev_link_t *link);
-void btuart_release(u_long arg);
+void btuart_release(dev_link_t *link);
 int btuart_event(event_t event, int priority, event_callback_args_t *args);
 
 static dev_info_t dev_info = "btuart_cs";
@@ -592,9 +591,6 @@ dev_link_t *btuart_attach(void)
 	link = &info->link;
 	link->priv = info;
 
-	init_timer(&link->release);
-	link->release.function = &btuart_release;
-	link->release.data = (u_long)link;
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
 	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
@@ -651,9 +647,8 @@ void btuart_detach(dev_link_t *link)
 	if (*linkp == NULL)
 		return;
 
-	del_timer(&link->release);
 	if (link->state & DEV_CONFIG)
-		btuart_release((u_long)link);
+		btuart_release(link);
 
 	if (link->handle) {
 		ret = CardServices(DeregisterClient, link->handle);
@@ -797,13 +792,12 @@ cs_failed:
 	cs_error(link->handle, last_fn, last_ret);
 
 failed:
-	btuart_release((u_long) link);
+	btuart_release(link);
 }
 
 
-void btuart_release(u_long arg)
+void btuart_release(dev_link_t *link)
 {
-	dev_link_t *link = (dev_link_t *)arg;
 	btuart_info_t *info = link->priv;
 
 	if (link->state & DEV_PRESENT)
@@ -829,7 +823,7 @@ int btuart_event(event_t event, int priority, event_callback_args_t *args)
 		link->state &= ~DEV_PRESENT;
 		if (link->state & DEV_CONFIG) {
 			btuart_close(info);
-			mod_timer(&link->release, jiffies + HZ / 20);
+			btuart_release(link);
 		}
 		break;
 	case CS_EVENT_CARD_INSERTION:
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 50240aac0e1d..96bfe85fdfec 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/timer.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
@@ -95,7 +94,7 @@ typedef struct dtl1_info_t {
 
 
 void dtl1_config(dev_link_t *link);
-void dtl1_release(u_long arg);
+void dtl1_release(dev_link_t *link);
 int dtl1_event(event_t event, int priority, event_callback_args_t *args);
 
 static dev_info_t dev_info = "dtl1_cs";
@@ -571,9 +570,6 @@ dev_link_t *dtl1_attach(void)
 	link = &info->link;
 	link->priv = info;
 
-	init_timer(&link->release);
-	link->release.function = &dtl1_release;
-	link->release.data = (u_long)link;
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
 	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
@@ -630,9 +626,8 @@ void dtl1_detach(dev_link_t *link)
 	if (*linkp == NULL)
 		return;
 
-	del_timer(&link->release);
 	if (link->state & DEV_CONFIG)
-		dtl1_release((u_long)link);
+		dtl1_release(link);
 
 	if (link->handle) {
 		ret = CardServices(DeregisterClient, link->handle);
@@ -749,13 +744,12 @@ cs_failed:
 	cs_error(link->handle, last_fn, last_ret);
 
 failed:
-	dtl1_release((u_long)link);
+	dtl1_release(link);
 }
 
 
-void dtl1_release(u_long arg)
+void dtl1_release(dev_link_t *link)
 {
-	dev_link_t *link = (dev_link_t *)arg;
 	dtl1_info_t *info = link->priv;
 
 	if (link->state & DEV_PRESENT)
@@ -781,7 +775,7 @@ int dtl1_event(event_t event, int priority, event_callback_args_t *args)
 		link->state &= ~DEV_PRESENT;
 		if (link->state & DEV_CONFIG) {
 			dtl1_close(info);
-			mod_timer(&link->release, jiffies + HZ / 20);
+			dtl1_release(link);
 		}
 		break;
 	case CS_EVENT_CARD_INSERTION: