[svn-commits] sruffell: linux/trunk r10163 - /linux/trunk/drivers/dahdi/wctdm24xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Aug 30 11:38:10 2011
New Revision: 10163

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10163
Log:
wctdm24xxp: Use fact that handle_transmit/receive are called in hard-irq

We can spend less time in interrupt context by not saving and restoring the
local interrupt state. This is a particularly noticeable improvement on debug
kernels with lockdep.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

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

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=10163&r1=10162&r2=10163
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Tue Aug 30 11:38:10 2011
@@ -1160,7 +1160,6 @@
 
 static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *sframe)
 {
-	unsigned long flags;
 	int x, y;
 	struct dahdi_span *s;
 	unsigned char *eframe = sframe;
@@ -1170,7 +1169,7 @@
 		for (x = 0; x < MAX_SPANS; x++) {
 			if (wc->spans[x]) {
 				s = &wc->spans[x]->span;
-				dahdi_transmit(s);
+				_dahdi_transmit(s);
 			}
 		}
 		insert_tdm_data(wc, sframe);
@@ -1183,7 +1182,7 @@
 #endif
 	}
 
-	spin_lock_irqsave(&wc->reglock, flags);
+	spin_lock(&wc->reglock);
 	for (x = 0; x < DAHDI_CHUNKSIZE; x++) {
 		/* Send a sample, as a 32-bit word */
 
@@ -1209,7 +1208,7 @@
 		}
 		eframe += (EFRAME_SIZE + EFRAME_GAP);
 	}
-	spin_unlock_irqrestore(&wc->reglock, flags);
+	spin_unlock(&wc->reglock);
 }
 
 /* Must be called with wc.reglock held and local interrupts disabled */
@@ -1433,7 +1432,6 @@
 
 static inline void wctdm_receiveprep(struct wctdm *wc, const u8 *sframe)
 {
-	unsigned long flags;
 	int x, y;
 	bool irqmiss = false;
 	unsigned char expected;
@@ -1442,7 +1440,7 @@
 	if (unlikely(!is_good_frame(sframe)))
 		return;
 
-	spin_lock_irqsave(&wc->reglock, flags);
+	spin_lock(&wc->reglock);
 
 	if (likely(is_initialized(wc)))
 		extract_tdm_data(wc, sframe);
@@ -1467,7 +1465,7 @@
 
 		eframe += (EFRAME_SIZE + EFRAME_GAP);
 	}
-	spin_unlock_irqrestore(&wc->reglock, flags);
+	spin_unlock(&wc->reglock);
 
 	/* XXX We're wasting 8 taps.  We should get closer :( */
 	if (likely(is_initialized(wc))) {
@@ -1478,7 +1476,7 @@
 			unsigned char buffer[DAHDI_CHUNKSIZE];
 			__dahdi_fifo_get(wc->ec_reference[x], buffer,
 				    ARRAY_SIZE(buffer));
-			dahdi_ec_chunk(c, c->readchunk, buffer);
+			_dahdi_ec_chunk(c, c->readchunk, buffer);
 #else
 			if ((wc->vpmoct) &&
 			    (wchan->timeslot == wc->vpmoct->preecho_timeslot) &&
@@ -1505,7 +1503,7 @@
 
 				}
 #endif
-				dahdi_receive(s);
+				_dahdi_receive(s);
 				if (unlikely(irqmiss))
 					++s->irqmisses;
 			}