[svn-commits] sruffell: linux/trunk r7521 - in /linux/trunk/drivers/dahdi: voicebus/ wctdm2...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Nov  6 18:35:43 2009
New Revision: 7521

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7521
Log:
voicebus, wctdm24xxp, wcte12xp: Move a print out of the interrupt handler.

This can be handled just as well in process context and printing to a serial
console from the interrupt handler has the potential to cause long latencies.

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.c
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.c?view=diff&rev=7521&r1=7520&r2=7521
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.c Fri Nov  6 18:35:43 2009
@@ -521,8 +521,9 @@
 		return res;
 	}
 	vpm->curpage = -1;
+
+	dev_info(&voicebus_get_pci_dev(vb)->dev, "Booting VPMADT032\n");
 	set_bit(VPM150M_SWRESET, &vpm->control);
-
 	while (test_bit(VPM150M_SWRESET, &vpm->control))
 		msleep(1);
 

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=7521&r1=7520&r2=7521
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Fri Nov  6 18:35:43 2009
@@ -459,7 +459,6 @@
 
 static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk, int whichframe)
 {
-	unsigned long flags;
 	struct vpmadt032_cmd *curcmd = NULL;
 	struct vpmadt032 *vpmadt032 = wc->vpmadt032;
 	int x;
@@ -467,8 +466,6 @@
 
 	/* Skip audio */
 	writechunk += 24;
-
-	spin_lock_irqsave(&wc->reglock, flags);
 
 	if (test_bit(VPM150M_SPIRESET, &vpmadt032->control) || test_bit(VPM150M_HPIRESET, &vpmadt032->control)) {
 		if (debug & DEBUG_ECHOCAN)
@@ -484,7 +481,6 @@
 			writechunk[CMD_BYTE(x, 1, 0)] = 0;
 			writechunk[CMD_BYTE(x, 2, 0)] = 0x00;
 		}
-		spin_unlock_irqrestore(&wc->reglock, flags);
 		return;
 	}
 
@@ -543,7 +539,6 @@
 			writechunk[CMD_BYTE(27, 2, 0)] = 0;
 		}
 	} else if (test_and_clear_bit(VPM150M_SWRESET, &vpmadt032->control)) {
-		printk(KERN_INFO "Booting VPMADT032\n");
 		for (x = 24; x < 28; x++) {
 			if (x == 24)
 				writechunk[CMD_BYTE(x, 0, 0)] = (0x8 << 4);
@@ -572,8 +567,6 @@
 	if (test_bit(VPM150M_ACTIVE, &vpmadt032->control) && !whichframe && !(wc->intcount % 100)) {
 		schedule_work(&vpmadt032->work);
 	}
-
-	spin_unlock_irqrestore(&wc->reglock, flags);
 }
 
 static inline void cmd_dequeue(struct wctdm *wc, unsigned char *writechunk, int card, int pos)

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7521&r1=7520&r2=7521
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Fri Nov  6 18:35:43 2009
@@ -493,7 +493,6 @@
 			writechunk[CMD_BYTE(4, 2, 1)] = 0;
 		}
 	} else if (test_and_clear_bit(VPM150M_SWRESET, &vpm->control)) {
-		debug_printk(1, "Booting  VPMADT032\n");
 		for (x = 0; x < 7; x++) {
 			if (0 == x)  {
 				writechunk[CMD_BYTE(x, 0, 1)] = (0x8 << 4);