All in-kernel PCMCIA devices do unregister their client in their respective
->detach() function after a REMOVAL event. So, AFAICS, the dev_list iteration
should always be false.

 drivers/bluetooth/bluecard_cs.c    |    5 +----
 drivers/bluetooth/bt3c_cs.c        |    5 +----
 drivers/bluetooth/btuart_cs.c      |    5 +----
 drivers/bluetooth/dtl1_cs.c        |    5 +----
 drivers/char/pcmcia/synclink_cs.c  |    8 +-------
 drivers/ide/legacy/ide-cs.c        |    3 +--
 drivers/isdn/hardware/avm/avm_cs.c |    8 +-------
 drivers/isdn/hisax/avma1_cs.c      |    8 +-------
 drivers/isdn/hisax/elsa_cs.c       |    5 +----
 drivers/isdn/hisax/sedlbauer_cs.c  |    8 +-------
 drivers/isdn/hisax/teles_cs.c      |    5 +----
 drivers/mtd/maps/pcmciamtd.c       |   30 +-----------------------------
 drivers/net/pcmcia/3c574_cs.c      |    3 +--
 drivers/net/pcmcia/3c589_cs.c      |    3 +--
 drivers/net/pcmcia/axnet_cs.c      |    3 +--
 drivers/net/pcmcia/com20020_cs.c   |    3 +--
 drivers/net/pcmcia/fmvj18x_cs.c    |    3 +--
 drivers/net/pcmcia/ibmtr_cs.c      |    3 +--
 drivers/net/pcmcia/nmclan_cs.c     |    3 +--
 drivers/net/pcmcia/pcnet_cs.c      |    3 +--
 drivers/net/pcmcia/smc91c92_cs.c   |    3 +--
 drivers/net/pcmcia/xirc2ps_cs.c    |    4 +---
 drivers/net/wireless/airo_cs.c     |    8 +-------
 drivers/net/wireless/atmel_cs.c    |    8 +-------
 drivers/net/wireless/netwave_cs.c  |    4 +---
 drivers/net/wireless/orinoco_cs.c  |    9 +--------
 drivers/net/wireless/ray_cs.c      |    3 +--
 drivers/net/wireless/wl3501_cs.c   |    8 +-------
 drivers/parport/parport_cs.c       |    5 +----
 drivers/scsi/pcmcia/aha152x_stub.c |    5 +----
 drivers/scsi/pcmcia/fdomain_stub.c |    5 +----
 drivers/scsi/pcmcia/nsp_cs.c       |    4 ++--
 drivers/scsi/pcmcia/qlogic_stub.c  |    5 +----
 drivers/serial/serial_cs.c         |    5 +----
 drivers/telephony/ixj_pcmcia.c     |    5 +----
 sound/pcmcia/pdaudiocf/pdaudiocf.c |   11 +----------
 sound/pcmcia/vx/vx_entry.c         |   10 ----------
 sound/pcmcia/vx/vxpocket.c         |    2 +-
 sound/pcmcia/vx/vxpocket.h         |    1 -
 39 files changed, 38 insertions(+), 186 deletions(-)

diff -ruN linux-original/drivers/bluetooth/bluecard_cs.c linux/drivers/bluetooth/bluecard_cs.c
--- linux-original/drivers/bluetooth/bluecard_cs.c	2004-11-13 13:29:17.000000000 +0100
+++ linux/drivers/bluetooth/bluecard_cs.c	2004-11-13 19:31:44.858718920 +0100
@@ -1117,10 +1117,7 @@
 static void __exit exit_bluecard_cs(void)
 {
 	pcmcia_unregister_driver(&bluecard_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		bluecard_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_bluecard_cs);
diff -ruN linux-original/drivers/bluetooth/bt3c_cs.c linux/drivers/bluetooth/bt3c_cs.c
--- linux-original/drivers/bluetooth/bt3c_cs.c	2004-11-13 13:29:17.000000000 +0100
+++ linux/drivers/bluetooth/bt3c_cs.c	2004-11-13 19:31:44.861718464 +0100
@@ -967,10 +967,7 @@
 static void __exit exit_bt3c_cs(void)
 {
 	pcmcia_unregister_driver(&bt3c_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		bt3c_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_bt3c_cs);
diff -ruN linux-original/drivers/bluetooth/btuart_cs.c linux/drivers/bluetooth/btuart_cs.c
--- linux-original/drivers/bluetooth/btuart_cs.c	2004-11-13 13:29:17.000000000 +0100
+++ linux/drivers/bluetooth/btuart_cs.c	2004-11-13 19:31:44.863718160 +0100
@@ -887,10 +887,7 @@
 static void __exit exit_btuart_cs(void)
 {
 	pcmcia_unregister_driver(&btuart_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		btuart_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_btuart_cs);
diff -ruN linux-original/drivers/bluetooth/dtl1_cs.c linux/drivers/bluetooth/dtl1_cs.c
--- linux-original/drivers/bluetooth/dtl1_cs.c	2004-11-13 13:29:17.000000000 +0100
+++ linux/drivers/bluetooth/dtl1_cs.c	2004-11-13 19:31:44.866717704 +0100
@@ -839,10 +839,7 @@
 static void __exit exit_dtl1_cs(void)
 {
 	pcmcia_unregister_driver(&dtl1_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		dtl1_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_dtl1_cs);
diff -ruN linux-original/drivers/char/pcmcia/synclink_cs.c linux/drivers/char/pcmcia/synclink_cs.c
--- linux-original/drivers/char/pcmcia/synclink_cs.c	2004-11-13 13:28:47.000000000 +0100
+++ linux/drivers/char/pcmcia/synclink_cs.c	2004-11-13 19:31:44.883715120 +0100
@@ -3147,13 +3147,7 @@
 	}
 
 	pcmcia_unregister_driver(&mgslpc_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL) {
-		if (dev_list->state & DEV_CONFIG)
-			mgslpc_release((u_long)dev_list);
-		mgslpc_detach(dev_list);
-	}
+	BUG_ON(dev_list != NULL);
 }
 
 static int __init synclink_cs_init(void)
diff -ruN linux-original/drivers/ide/legacy/ide-cs.c linux/drivers/ide/legacy/ide-cs.c
--- linux-original/drivers/ide/legacy/ide-cs.c	2004-11-13 13:28:57.000000000 +0100
+++ linux/drivers/ide/legacy/ide-cs.c	2004-11-13 19:31:44.884714968 +0100
@@ -485,8 +485,7 @@
 static void __exit exit_ide_cs(void)
 {
 	pcmcia_unregister_driver(&ide_cs_driver);
-	while (dev_list != NULL)
-		ide_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_ide_cs);
diff -ruN linux-original/drivers/isdn/hardware/avm/avm_cs.c linux/drivers/isdn/hardware/avm/avm_cs.c
--- linux-original/drivers/isdn/hardware/avm/avm_cs.c	2004-11-13 13:28:55.000000000 +0100
+++ linux/drivers/isdn/hardware/avm/avm_cs.c	2004-11-13 19:31:44.929708128 +0100
@@ -521,13 +521,7 @@
 static void __exit avmcs_exit(void)
 {
 	pcmcia_unregister_driver(&avmcs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL) {
-		if (dev_list->state & DEV_CONFIG)
-			avmcs_release(dev_list);
-		avmcs_detach(dev_list);
-	}
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(avmcs_init);
diff -ruN linux-original/drivers/isdn/hisax/avma1_cs.c linux/drivers/isdn/hisax/avma1_cs.c
--- linux-original/drivers/isdn/hisax/avma1_cs.c	2004-11-13 13:28:55.000000000 +0100
+++ linux/drivers/isdn/hisax/avma1_cs.c	2004-11-13 19:31:44.930707976 +0100
@@ -531,13 +531,7 @@
 static void __exit exit_avma1_cs(void)
 {
 	pcmcia_unregister_driver(&avma1cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL) {
-		if (dev_list->state & DEV_CONFIG)
-			avma1cs_release(dev_list);
-		avma1cs_detach(dev_list);
-	}
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_avma1_cs);
diff -ruN linux-original/drivers/isdn/hisax/elsa_cs.c linux/drivers/isdn/hisax/elsa_cs.c
--- linux-original/drivers/isdn/hisax/elsa_cs.c	2004-11-13 13:28:55.000000000 +0100
+++ linux/drivers/isdn/hisax/elsa_cs.c	2004-11-13 19:31:44.931707824 +0100
@@ -541,10 +541,7 @@
 static void __exit exit_elsa_cs(void)
 {
 	pcmcia_unregister_driver(&elsa_cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		elsa_cs_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_elsa_cs);
diff -ruN linux-original/drivers/isdn/hisax/sedlbauer_cs.c linux/drivers/isdn/hisax/sedlbauer_cs.c
--- linux-original/drivers/isdn/hisax/sedlbauer_cs.c	2004-11-13 13:28:55.000000000 +0100
+++ linux/drivers/isdn/hisax/sedlbauer_cs.c	2004-11-13 19:31:44.932707672 +0100
@@ -648,13 +648,7 @@
 static void __exit exit_sedlbauer_cs(void)
 {
 	pcmcia_unregister_driver(&sedlbauer_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL) {
-		if (dev_list->state & DEV_CONFIG)
-			sedlbauer_release(dev_list);
-		sedlbauer_detach(dev_list);
-	}
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_sedlbauer_cs);
diff -ruN linux-original/drivers/isdn/hisax/teles_cs.c linux/drivers/isdn/hisax/teles_cs.c
--- linux-original/drivers/isdn/hisax/teles_cs.c	2004-11-13 13:28:55.000000000 +0100
+++ linux/drivers/isdn/hisax/teles_cs.c	2004-11-13 19:31:44.933707520 +0100
@@ -522,10 +522,7 @@
 static void __exit exit_teles_cs(void)
 {
 	pcmcia_unregister_driver(&teles_cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		teles_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_teles_cs);
diff -ruN linux-original/drivers/mtd/maps/pcmciamtd.c linux/drivers/mtd/maps/pcmciamtd.c
--- linux-original/drivers/mtd/maps/pcmciamtd.c	2004-11-13 13:29:16.000000000 +0100
+++ linux/drivers/mtd/maps/pcmciamtd.c	2004-11-13 19:31:44.000000000 +0100
@@ -854,35 +854,7 @@
 {
 	DEBUG(1, DRIVER_DESC " unloading");
 	pcmcia_unregister_driver(&pcmciamtd_driver);
-
-	while(dev_list) {
-		dev_link_t *link = dev_list;
-
-		dev_list = link->next;
-		if (link) {
-			struct pcmciamtd_dev *dev = link->priv;
-			
- 			if(dev) {
-				if(link->state & DEV_PRESENT) {
-					if (!(link->state & DEV_STALE_LINK)) {
-						pcmciamtd_detach(link);
-					}
-					link->state &= ~DEV_PRESENT;
-					if(dev->mtd_info) {
-						del_mtd_device(dev->mtd_info);
-						info("mtd%d: Removed",
-						     dev->mtd_info->index);
-					}
-				}
-				if(dev->mtd_info) {
-					DEBUG(2, "Destroying map for mtd%d",
-					      dev->mtd_info->index);
-					map_destroy(dev->mtd_info);
-				}
-				kfree(dev);
-			}
-		}
-	}
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_pcmciamtd);
diff -ruN linux-original/drivers/net/pcmcia/3c574_cs.c linux/drivers/net/pcmcia/3c574_cs.c
--- linux-original/drivers/net/pcmcia/3c574_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/3c574_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -1308,8 +1308,7 @@
 static void __exit exit_tc574(void)
 {
 	pcmcia_unregister_driver(&tc574_driver);
-	while (dev_list != NULL)
-		tc574_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_tc574);
diff -ruN linux-original/drivers/net/pcmcia/3c589_cs.c linux/drivers/net/pcmcia/3c589_cs.c
--- linux-original/drivers/net/pcmcia/3c589_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/3c589_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -1083,8 +1083,7 @@
 static void __exit exit_tc589(void)
 {
 	pcmcia_unregister_driver(&tc589_driver);
-	while (dev_list != NULL)
-		tc589_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_tc589);
diff -ruN linux-original/drivers/net/pcmcia/axnet_cs.c linux/drivers/net/pcmcia/axnet_cs.c
--- linux-original/drivers/net/pcmcia/axnet_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/axnet_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -877,8 +877,7 @@
 static void __exit exit_axnet_cs(void)
 {
 	pcmcia_unregister_driver(&axnet_cs_driver);
-	while (dev_list != NULL)
-		axnet_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_axnet_cs);
diff -ruN linux-original/drivers/net/pcmcia/com20020_cs.c linux/drivers/net/pcmcia/com20020_cs.c
--- linux-original/drivers/net/pcmcia/com20020_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/com20020_cs.c	2004-11-13 19:31:44.938706760 +0100
@@ -513,8 +513,7 @@
 static void __exit exit_com20020_cs(void)
 {
 	pcmcia_unregister_driver(&com20020_cs_driver);
-	while (dev_list != NULL)
-		com20020_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_com20020_cs);
diff -ruN linux-original/drivers/net/pcmcia/fmvj18x_cs.c linux/drivers/net/pcmcia/fmvj18x_cs.c
--- linux-original/drivers/net/pcmcia/fmvj18x_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/fmvj18x_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -792,8 +792,7 @@
 static void __exit exit_fmvj18x_cs(void)
 {
 	pcmcia_unregister_driver(&fmvj18x_cs_driver);
-	while (dev_list != NULL)
-		fmvj18x_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_fmvj18x_cs);
diff -ruN linux-original/drivers/net/pcmcia/ibmtr_cs.c linux/drivers/net/pcmcia/ibmtr_cs.c
--- linux-original/drivers/net/pcmcia/ibmtr_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/ibmtr_cs.c	2004-11-13 19:31:44.940706456 +0100
@@ -538,8 +538,7 @@
 static void __exit exit_ibmtr_cs(void)
 {
 	pcmcia_unregister_driver(&ibmtr_cs_driver);
-	while (dev_list != NULL)
-		ibmtr_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_ibmtr_cs);
diff -ruN linux-original/drivers/net/pcmcia/nmclan_cs.c linux/drivers/net/pcmcia/nmclan_cs.c
--- linux-original/drivers/net/pcmcia/nmclan_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/nmclan_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -1702,8 +1702,7 @@
 static void __exit exit_nmclan_cs(void)
 {
 	pcmcia_unregister_driver(&nmclan_cs_driver);
-	while (dev_list != NULL)
-		nmclan_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_nmclan_cs);
diff -ruN linux-original/drivers/net/pcmcia/pcnet_cs.c linux/drivers/net/pcmcia/pcnet_cs.c
--- linux-original/drivers/net/pcmcia/pcnet_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/pcnet_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -1659,8 +1659,7 @@
 {
     DEBUG(0, "pcnet_cs: unloading\n");
     pcmcia_unregister_driver(&pcnet_driver);
-    while (dev_list != NULL)
-	pcnet_detach(dev_list);
+    BUG_ON(dev_list != NULL);
 }
 
 module_init(init_pcnet_cs);
diff -ruN linux-original/drivers/net/pcmcia/smc91c92_cs.c linux/drivers/net/pcmcia/smc91c92_cs.c
--- linux-original/drivers/net/pcmcia/smc91c92_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/smc91c92_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -2263,8 +2263,7 @@
 static void __exit exit_smc91c92_cs(void)
 {
 	pcmcia_unregister_driver(&smc91c92_cs_driver);
-	while (dev_list != NULL)
-		smc91c92_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_smc91c92_cs);
diff -ruN linux-original/drivers/net/pcmcia/xirc2ps_cs.c linux/drivers/net/pcmcia/xirc2ps_cs.c
--- linux-original/drivers/net/pcmcia/xirc2ps_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/pcmcia/xirc2ps_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -2016,9 +2016,7 @@
 exit_xirc2ps_cs(void)
 {
 	pcmcia_unregister_driver(&xirc2ps_cs_driver);
-
-	while (dev_list)
-		xirc2ps_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_xirc2ps_cs);
diff -ruN linux-original/drivers/net/wireless/airo_cs.c linux/drivers/net/wireless/airo_cs.c
--- linux-original/drivers/net/wireless/airo_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/wireless/airo_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -592,13 +592,7 @@
 static void airo_cs_cleanup(void)
 {
 	pcmcia_unregister_driver(&airo_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL) {
-		if (dev_list->state & DEV_CONFIG)
-			airo_release(dev_list);
-		airo_detach(dev_list);
-	}
+	BUG_ON(dev_list != NULL);
 }
 
 /*
diff -ruN linux-original/drivers/net/wireless/atmel_cs.c linux/drivers/net/wireless/atmel_cs.c
--- linux-original/drivers/net/wireless/atmel_cs.c	2004-11-13 13:28:43.000000000 +0100
+++ linux/drivers/net/wireless/atmel_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -693,13 +693,7 @@
 static void atmel_cs_cleanup(void)
 {
         pcmcia_unregister_driver(&atmel_driver);
-
-        /* XXX: this really needs to move into generic code.. */
-        while (dev_list != NULL) {
-                if (dev_list->state & DEV_CONFIG)
-                        atmel_release(dev_list);
-                atmel_detach(dev_list);
-        }
+	BUG_ON(dev_list != NULL);
 }
 
 /*
diff -ruN linux-original/drivers/net/wireless/netwave_cs.c linux/drivers/net/wireless/netwave_cs.c
--- linux-original/drivers/net/wireless/netwave_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/wireless/netwave_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -1692,9 +1692,7 @@
 static void __exit exit_netwave_cs(void)
 {
 	pcmcia_unregister_driver(&netwave_driver);
-
-	if (dev_list != NULL)	/* Critical situation */
-		printk("netwave_cs: devices remaining when removing module\n");
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_netwave_cs);
diff -ruN linux-original/drivers/net/wireless/orinoco_cs.c linux/drivers/net/wireless/orinoco_cs.c
--- linux-original/drivers/net/wireless/orinoco_cs.c	2004-11-13 13:28:42.000000000 +0100
+++ linux/drivers/net/wireless/orinoco_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -653,14 +653,7 @@
 exit_orinoco_cs(void)
 {
 	pcmcia_unregister_driver(&orinoco_driver);
-
-	if (dev_list)
-		DEBUG(0, PFX "Removing leftover devices.\n");
-	while (dev_list != NULL) {
-		if (dev_list->state & DEV_CONFIG)
-			orinoco_cs_release(dev_list);
-		orinoco_cs_detach(dev_list);
-	}
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_orinoco_cs);
diff -ruN linux-original/drivers/net/wireless/ray_cs.c linux/drivers/net/wireless/ray_cs.c
--- linux-original/drivers/net/wireless/ray_cs.c	2004-11-13 13:28:43.000000000 +0100
+++ linux/drivers/net/wireless/ray_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -2956,8 +2956,7 @@
 #endif
 
     pcmcia_unregister_driver(&ray_driver);
-    while (dev_list != NULL)
-        ray_detach(dev_list);
+    BUG_ON(dev_list != NULL);
 } /* exit_ray_cs */
 
 module_init(init_ray_cs);
diff -ruN linux-original/drivers/net/wireless/wl3501_cs.c linux/drivers/net/wireless/wl3501_cs.c
--- linux-original/drivers/net/wireless/wl3501_cs.c	2004-11-13 13:28:43.000000000 +0100
+++ linux/drivers/net/wireless/wl3501_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -2267,13 +2267,7 @@
 {
 	dprintk(0, ": unloading");
 	pcmcia_unregister_driver(&wl3501_driver);
-	while (wl3501_dev_list) {
-		/* Mark the device as non-existing to minimize calls to card */
-		wl3501_dev_list->state &= ~DEV_PRESENT;
-		if (wl3501_dev_list->state & DEV_CONFIG)
-			wl3501_release(wl3501_dev_list);
-		wl3501_detach(wl3501_dev_list);
-	}
+	BUG_ON(wl3501_dev_list != NULL);
 }
 
 module_init(wl3501_init_module);
diff -ruN linux-original/drivers/parport/parport_cs.c linux/drivers/parport/parport_cs.c
--- linux-original/drivers/parport/parport_cs.c	2004-11-13 13:29:09.000000000 +0100
+++ linux/drivers/parport/parport_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -401,10 +401,7 @@
 static void __exit exit_parport_cs(void)
 {
 	pcmcia_unregister_driver(&parport_cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		parport_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_parport_cs);
diff -ruN linux-original/drivers/scsi/pcmcia/aha152x_stub.c linux/drivers/scsi/pcmcia/aha152x_stub.c
--- linux-original/drivers/scsi/pcmcia/aha152x_stub.c	2004-11-13 13:28:52.000000000 +0100
+++ linux/drivers/scsi/pcmcia/aha152x_stub.c	2004-11-13 19:31:44.000000000 +0100
@@ -347,10 +347,7 @@
 static void __exit exit_aha152x_cs(void)
 {
 	pcmcia_unregister_driver(&aha152x_cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		aha152x_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_aha152x_cs);
diff -ruN linux-original/drivers/scsi/pcmcia/fdomain_stub.c linux/drivers/scsi/pcmcia/fdomain_stub.c
--- linux-original/drivers/scsi/pcmcia/fdomain_stub.c	2004-11-13 13:28:52.000000000 +0100
+++ linux/drivers/scsi/pcmcia/fdomain_stub.c	2004-11-13 19:31:44.000000000 +0100
@@ -328,10 +328,7 @@
 static void __exit exit_fdomain_cs(void)
 {
 	pcmcia_unregister_driver(&fdomain_cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		fdomain_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_fdomain_cs);
diff -ruN linux-original/drivers/scsi/pcmcia/nsp_cs.c linux/drivers/scsi/pcmcia/nsp_cs.c
--- linux-original/drivers/scsi/pcmcia/nsp_cs.c	2004-11-13 13:28:52.000000000 +0100
+++ linux/drivers/scsi/pcmcia/nsp_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -2194,10 +2194,9 @@
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,68))
 	pcmcia_unregister_driver(&nsp_driver);
+	BUG_ON(dev_list != NULL);
 #else
 	unregister_pcmcia_driver(&dev_info);
-#endif
-
 	/* XXX: this really needs to move into generic code.. */
 	while (dev_list != NULL) {
 		if (dev_list->state & DEV_CONFIG) {
@@ -2205,6 +2204,7 @@
 		}
 		nsp_cs_detach(dev_list);
 	}
+#endif
 }
 
 
diff -ruN linux-original/drivers/scsi/pcmcia/qlogic_stub.c linux/drivers/scsi/pcmcia/qlogic_stub.c
--- linux-original/drivers/scsi/pcmcia/qlogic_stub.c	2004-11-13 13:28:52.000000000 +0100
+++ linux/drivers/scsi/pcmcia/qlogic_stub.c	2004-11-13 19:31:44.000000000 +0100
@@ -432,10 +432,7 @@
 static void __exit exit_qlogic_cs(void)
 {
 	pcmcia_unregister_driver(&qlogic_cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		qlogic_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 MODULE_AUTHOR("Tom Zerucha, Michael Griffith");
diff -ruN linux-original/drivers/serial/serial_cs.c linux/drivers/serial/serial_cs.c
--- linux-original/drivers/serial/serial_cs.c	2004-11-13 13:29:18.000000000 +0100
+++ linux/drivers/serial/serial_cs.c	2004-11-13 19:31:44.000000000 +0100
@@ -749,10 +749,7 @@
 static void __exit exit_serial_cs(void)
 {
 	pcmcia_unregister_driver(&serial_cs_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		serial_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_serial_cs);
diff -ruN linux-original/drivers/telephony/ixj_pcmcia.c linux/drivers/telephony/ixj_pcmcia.c
--- linux-original/drivers/telephony/ixj_pcmcia.c	2004-11-13 13:29:10.000000000 +0100
+++ linux/drivers/telephony/ixj_pcmcia.c	2004-11-13 19:31:44.000000000 +0100
@@ -313,10 +313,7 @@
 static void ixj_pcmcia_exit(void)
 {
 	pcmcia_unregister_driver(&ixj_driver);
-
-	/* XXX: this really needs to move into generic code.. */
-	while (dev_list != NULL)
-		ixj_detach(dev_list);
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(ixj_pcmcia_init);
diff -ruN linux-original/sound/pcmcia/pdaudiocf/pdaudiocf.c linux/sound/pcmcia/pdaudiocf/pdaudiocf.c
--- linux-original/sound/pcmcia/pdaudiocf/pdaudiocf.c	2004-11-13 13:29:56.000000000 +0100
+++ linux/sound/pcmcia/pdaudiocf/pdaudiocf.c	2004-11-13 19:31:44.000000000 +0100
@@ -274,15 +274,6 @@
 }
 
 /*
- * snd_pdacf_detach_all - detach all instances linked to the hw
- */
-static void snd_pdacf_detach_all(void)
-{
-	while (dev_list != NULL)
-		snd_pdacf_detach(dev_list);
-}
-
-/*
  * configuration callback
  */
 
@@ -413,7 +404,7 @@
 static void __exit exit_pdacf(void)
 {
 	pcmcia_unregister_driver(&pdacf_cs_driver);
-	snd_pdacf_detach_all();
+	BUG_ON(dev_list != NULL);
 }
 
 module_init(init_pdacf);
diff -ruN linux-original/sound/pcmcia/vx/vx_entry.c linux/sound/pcmcia/vx/vx_entry.c
--- linux-original/sound/pcmcia/vx/vx_entry.c	2004-11-13 13:29:56.000000000 +0100
+++ linux/sound/pcmcia/vx/vx_entry.c	2004-11-13 19:31:45.000000000 +0100
@@ -245,15 +245,6 @@
 }
 
 /*
- * snd_vxpocket_detach_all - detach all instances linked to the hw
- */
-void snd_vxpocket_detach_all(struct snd_vxp_entry *hw)
-{
-	while (hw->dev_list != NULL)
-		snd_vxpocket_detach(hw, hw->dev_list);
-}
-
-/*
  * configuration callback
  */
 
@@ -373,4 +364,3 @@
 EXPORT_SYMBOL(snd_vxpocket_ops);
 EXPORT_SYMBOL(snd_vxpocket_attach);
 EXPORT_SYMBOL(snd_vxpocket_detach);
-EXPORT_SYMBOL(snd_vxpocket_detach_all);
diff -ruN linux-original/sound/pcmcia/vx/vxpocket.c linux/sound/pcmcia/vx/vxpocket.c
--- linux-original/sound/pcmcia/vx/vxpocket.c	2004-11-13 13:29:56.000000000 +0100
+++ linux/sound/pcmcia/vx/vxpocket.c	2004-11-13 19:31:45.000000000 +0100
@@ -165,7 +165,7 @@
 static void __exit exit_vxpocket(void)
 {
 	pcmcia_unregister_driver(&vxp_cs_driver);
-	snd_vxpocket_detach_all(&hw_entry);
+	BUG_ON(hw_entry.dev_list != NULL);
 }
 
 module_init(init_vxpocket);
diff -ruN linux-original/sound/pcmcia/vx/vxpocket.h linux/sound/pcmcia/vx/vxpocket.h
--- linux-original/sound/pcmcia/vx/vxpocket.h	2004-11-13 13:29:56.000000000 +0100
+++ linux/sound/pcmcia/vx/vxpocket.h	2004-11-13 19:31:45.000000000 +0100
@@ -77,7 +77,6 @@
  */
 dev_link_t *snd_vxpocket_attach(struct snd_vxp_entry *hw);
 void snd_vxpocket_detach(struct snd_vxp_entry *hw, dev_link_t *link);
-void snd_vxpocket_detach_all(struct snd_vxp_entry *hw);
 
 int vxp_add_mic_controls(vx_core_t *chip);