[svn-commits] sruffell: linux/trunk r6926 - /linux/trunk/drivers/dahdi/wctdm24xxp/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Aug  4 11:22:17 2009
New Revision: 6926

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6926
Log:
wctdm24xxp: We no longer need to keep our own reference count.

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=6926&r1=6925&r2=6926
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Tue Aug  4 11:22:17 2009
@@ -2957,9 +2957,6 @@
 
 	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 @@
 	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 @@
 			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 @@
 			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");
 	}
 }
 

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h?view=diff&rev=6926&r1=6925&r2=6926
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/wctdm24xxp.h Tue Aug  4 11:22:17 2009
@@ -146,13 +146,11 @@
 	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;