diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-03-22 09:20:54 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-03-22 09:20:54 +0000 |
| commit | d010a28168a6883ef74e1f7c55c6576cf19bba4f (patch) | |
| tree | a5f23aecb05902f23740cc20ca12713c5e371a6f | |
| parent | d30b83f073b29ab7e72766e136e2fd79998a824a (diff) | |
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.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8378 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/voicebus/voicebus.c | 12 | ||||
| -rw-r--r-- | drivers/dahdi/voicebus/voicebus.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c index 277db30..68dd9f5 100644 --- a/drivers/dahdi/voicebus/voicebus.c +++ b/drivers/dahdi/voicebus/voicebus.c @@ -960,15 +960,6 @@ voicebus_stop(struct voicebus *vb) 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 @@ vb_isr(int irq, void *dev_id) 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 @@ __voicebus_init(struct voicebus *vb, const char *board_name, int normal_mode) 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) diff --git a/drivers/dahdi/voicebus/voicebus.h b/drivers/dahdi/voicebus/voicebus.h index 553d6e6..de565d9 100644 --- a/drivers/dahdi/voicebus/voicebus.h +++ b/drivers/dahdi/voicebus/voicebus.h @@ -114,7 +114,6 @@ struct voicebus { 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; |