[svn-commits] sruffell: linux/trunk r8378 - /linux/trunk/drivers/dahdi/voicebus/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Mar 22 04:20:54 2010
New Revision: 8378

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8378
Log:
wctdm24xxp, wcte12xp: Remove the completion on shutdown.

Oddities in the receive processor state make this completion not so useful
anymore.  It is more straightforward to simply poll the state on shutdown.

Modified:
    linux/trunk/drivers/dahdi/voicebus/voicebus.c
    linux/trunk/drivers/dahdi/voicebus/voicebus.h

Modified: linux/trunk/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=8378&r1=8377&r2=8378
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/voicebus.c Mon Mar 22 04:20:54 2010
@@ -960,15 +960,6 @@
 		return 0;
 	}
 
-	if (__vb_getctl(vb, IER_CSR7) & 0x10000) {
-		INIT_COMPLETION(vb->stopped_completion);
-		if (wait_for_completion_timeout(&vb->stopped_completion, HZ)) {
-			BUG_ON(!vb_is_stopped(vb));
-		} else {
-			dev_warn(&vb->pdev->dev, "Timeout while waiting for "
-				 "board to stop.\n");
-		}
-	}
 
 	set_bit(VOICEBUS_STOPPED, &vb->flags);
 
@@ -1369,14 +1360,12 @@
 			BUG_ON(!test_bit(VOICEBUS_STOP, &vb->flags));
 			if (__vb_is_stopped(vb)) {
 				__vb_disable_interrupts(vb);
-				complete(&vb->stopped_completion);
 			}
 		}
 		if (int_status & RX_STOPPED_INTERRUPT) {
 			BUG_ON(!test_bit(VOICEBUS_STOP, &vb->flags));
 			if (__vb_is_stopped(vb)) {
 				__vb_disable_interrupts(vb);
-				complete(&vb->stopped_completion);
 			}
 		}
 
@@ -1431,7 +1420,6 @@
 	vb->max_latency = VOICEBUS_DEFAULT_MAXLATENCY;
 
 	spin_lock_init(&vb->lock);
-	init_completion(&vb->stopped_completion);
 	set_bit(VOICEBUS_STOP, &vb->flags);
 
 	if (normal_mode)

Modified: linux/trunk/drivers/dahdi/voicebus/voicebus.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/voicebus.h?view=diff&rev=8378&r1=8377&r2=8378
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/voicebus.h (original)
+++ linux/trunk/drivers/dahdi/voicebus/voicebus.h Mon Mar 22 04:20:54 2010
@@ -114,7 +114,6 @@
 
 	struct work_struct	underrun_work;
 	const struct voicebus_operations *ops;
-	struct completion	stopped_completion;
 	unsigned long		flags;
 	unsigned int		min_tx_buffer_count;
 	unsigned int		max_latency;