From fab5519e0a98d057f4e7beb11cde6c9c32318313 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Dec 2006 02:39:03 -0800
Subject: [PATCH] --- yaml --- r: 43709 b: refs/heads/master c:
 55e7071a3c6cdb65fb5ce3ea9c692a8d78ed0844 h: refs/heads/master i:   43707:
 85848b3c3ceadec6d8a57d3d861727490c73ff80 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/char/sx.c | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index b148b83f953f..f29985f3246a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42f6384fe4747f65dc27e8a5f96502204558203b
+refs/heads/master: 55e7071a3c6cdb65fb5ce3ea9c692a8d78ed0844
diff --git a/trunk/drivers/char/sx.c b/trunk/drivers/char/sx.c
index 42427f4d2ebd..ca6d51895013 100644
--- a/trunk/drivers/char/sx.c
+++ b/trunk/drivers/char/sx.c
@@ -2680,28 +2680,16 @@ static int __init sx_init(void)
 static void __exit sx_exit (void)
 {
 	int i; 
-	struct sx_board *board;
 
 	func_enter();
 #ifdef CONFIG_EISA
 	eisa_driver_unregister(&sx_eisadriver);
 #endif
 	pci_unregister_driver(&sx_pcidriver);
-	for (i = 0; i < SX_NBOARDS; i++) {
-		board = &boards[i];
-		if (board->flags & SX_BOARD_INITIALIZED) {
-			sx_dprintk (SX_DEBUG_CLEANUP, "Cleaning up board at %p\n", board->base);
-			/* The board should stop messing with us.
-			   (actually I mean the interrupt) */
-			sx_reset (board);
-			if ((board->irq) && (board->flags & SX_IRQ_ALLOCATED))
-				free_irq (board->irq, board);
 
-			/* It is safe/allowed to del_timer a non-active timer */
-			del_timer (& board->timer);
-			iounmap(board->base);
-		}
-	}
+	for (i = 0; i < SX_NBOARDS; i++)
+		sx_remove_card(&boards[i]);
+
 	if (misc_deregister(&sx_fw_device) < 0) {
 		printk (KERN_INFO "sx: couldn't deregister firmware loader device\n");
 	}