From 4378b9f38c5c6e0e1ef363f519361c47c51611a1 Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@digium.com>
Date: Tue, 4 Aug 2009 16:22:17 +0000
Subject: wctdm24xxp: We no longer need to keep our own reference count.

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6926 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 drivers/dahdi/wctdm24xxp/base.c       | 19 ++++---------------
 drivers/dahdi/wctdm24xxp/wctdm24xxp.h |  2 --
 2 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'drivers/dahdi/wctdm24xxp')

diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index b3103ee..a4fcd88 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -2957,9 +2957,6 @@ static int wctdm_open(struct dahdi_chan *chan)
 
 	if (!(wc->cardflag & (1 << (chan->chanpos - 1))))
 		return -ENODEV;
-	if (wc->dead)
-		return -ENODEV;
-	wc->usecount++;
 	
 	/* Reset the mwi indicators */
 	spin_lock_irqsave(&wc->reglock, flags);
@@ -2982,7 +2979,6 @@ static int wctdm_close(struct dahdi_chan *chan)
 	struct wctdm *wc = chan->pvt;
 	int x;
 	signed char reg;
-	wc->usecount--;
 	for (x=0;x<wc->cards;x++) {
 		if (wc->modtype[x] == MOD_TYPE_FXS) {
 			wc->mods[x].fxs.idletxhookstate = POLARITY_XOR(x) ? 5 : 1;
@@ -3005,9 +3001,7 @@ static int wctdm_close(struct dahdi_chan *chan)
 			qrv_dosetup(chan,wc);
 		}
 	}
-	/* If we're dead, release us now */
-	if (!wc->usecount && wc->dead) 
-		wctdm_release(wc);
+
 	return 0;
 }
 
@@ -3800,14 +3794,9 @@ static void __devexit wctdm_remove_one(struct pci_dev *pdev)
 			wc->vpmadt032 = NULL;
 		}
 
-		/* Release span, possibly delayed */
-		if (!wc->usecount) {
-			wctdm_release(wc);
-			printk(KERN_INFO "Freed a Wildcard\n");
-		}
-		else {
-			wc->dead = 1;
-		}
+		/* Release span */
+		wctdm_release(wc);
+		printk(KERN_INFO "Freed a Wildcard\n");
 	}
 }
 
diff --git a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
index 3d08bef..95f712c 100644
--- a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
+++ b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
@@ -146,13 +146,11 @@ struct wctdm {
 	struct dahdi_span span;
 	unsigned char ios;
 	unsigned int sdi;
-	int usecount;
 	unsigned int intcount;
 	unsigned int rxints;
 	unsigned int txints;
 	unsigned char txident;
 	unsigned char rxident;
-	int dead;
 	int pos;
 	int flags[NUM_CARDS];
 	int alt;
-- 
cgit v1.2.3