[dahdi-commits] sruffell: branch linux/sruffell/dahdi-linux-chainedvb r7343 - /linux/team/sru...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Mon Oct  5 18:24:31 2009
New Revision: 7343

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7343
Log:
wip: Minor reformatting

Modified:
    linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c

Modified: linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=7343&r1=7342&r2=7343
==============================================================================
--- linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c Mon Oct  5 18:24:31 2009
@@ -1280,26 +1280,21 @@
 
 	latency = (vb->min_tx_buffer_count + increase > MAX_LATENCY) ?
 			MAX_LATENCY : vb->min_tx_buffer_count + increase;
-	/* Because there are 2 buffers in the transmit FIFO on the
-	 * hardware, setting 3 ms of latency means that the host needs
-	 * to be able to service the cards within 1ms.  This is because
-	 * the interface will load up 2 buffers into the TX FIFO then
-	 * attempt to read the 3rd descriptor.  If the OWN bit isn't
-	 * set, then the hardware will set the TX descriptor not
-	 * available interrupt.
-	 */
-	/* Set the minimum latency in case we're restarted...we don't
-	 * want to wait for the buffer to grow to this depth again in
-	 * that case.
-	 */
+
+	/* Because there are 2 buffers in the transmit FIFO on the hardware,
+	 * setting 3 ms of latency means that the host needs to be able to
+	 * service the cards within 1ms.  This is because the interface will
+	 * load up 2 buffers into the TX FIFO then attempt to read the 3rd
+	 * descriptor.  If the OWN bit isn't set, then the hardware will set the
+	 * TX descriptor not available interrupt. */
+
+	/* Set the minimum latency in case we're restarted...we don't want to
+	 * wait for the buffer to grow to this depth again in that case. */
 	increase = latency - vb->min_tx_buffer_count;
 	while (increase--) {
 		vbb = voicebus_alloc(vb);
-
-		if (unlikely(NULL == vbb))
-			BUG_ON(1);
-		else
-			vb->handle_transmit(vbb, vb->context);
+		BUG_ON(NULL == vbb);
+		vb->handle_transmit(vbb, vb->context);
 	}
 	voicebus_set_minlatency(vb, latency);
 }