[svn-commits] sruffell: linux/trunk r6117 - /linux/trunk/drivers/dahdi/voicebus.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Mar 11 09:50:26 CDT 2009
Author: sruffell
Date: Wed Mar 11 09:50:22 2009
New Revision: 6117
URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6117
Log:
Fixed up spacing around parenthesis.
Modified:
linux/trunk/drivers/dahdi/voicebus.c
Modified: linux/trunk/drivers/dahdi/voicebus.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/voicebus.c?view=diff&rev=6117&r1=6116&r2=6117
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus.c Wed Mar 11 09:50:22 2009
@@ -96,7 +96,7 @@
#define CSR7_AIE 0x00008000 /* abnormal enable */
#define CSR7_NIE 0x00010000 /* normal enable */
-#define DEFAULT_INTERRUPTS ( CSR7_TCIE | CSR7_TPSIE | CSR7_TDUIE | \
+#define DEFAULT_INTERRUPTS (CSR7_TCIE | CSR7_TPSIE | CSR7_TDUIE | \
CSR7_RUIE | CSR7_RSIE | CSR7_FBEIE | \
CSR7_AIE | CSR7_NIE)
@@ -275,9 +275,9 @@
clear_bit(IN_DEFERRED_PROCESSING, &vb->flags);
}
#else
-#define assert_in_vb_deferred(_x_) do {;} while(0)
-#define start_vb_deferred(_x_) do {;} while(0)
-#define stop_vb_deferred(_x_) do {;} while(0)
+#define assert_in_vb_deferred(_x_) do {;} while (0)
+#define start_vb_deferred(_x_) do {;} while (0)
+#define stop_vb_deferred(_x_) do {;} while (0)
#endif
static inline struct voicebus_descriptor *
@@ -320,7 +320,7 @@
}
memset(dl->desc, 0, (sizeof(*d) + dl->padding) * DRING_SIZE);
- for ( i = 0; i < DRING_SIZE; ++i) {
+ for (i = 0; i < DRING_SIZE; ++i) {
d = vb_descriptor(dl, i);
d->des1 = des1;
}
@@ -358,10 +358,10 @@
*
*/
#define MESSAGE "%d ms is an invalid value for minumum latency. Setting to %d ms.\n"
- if ( DRING_SIZE < ms ) {
+ if (DRING_SIZE < ms) {
VB_PRINTK(vb, WARNING, MESSAGE, ms, DRING_SIZE);
return -EINVAL;
- } else if (VOICEBUS_DEFAULT_LATENCY > ms ) {
+ } else if (VOICEBUS_DEFAULT_LATENCY > ms) {
VB_PRINTK(vb, WARNING, MESSAGE, ms, VOICEBUS_DEFAULT_LATENCY);
return -EINVAL;
}
@@ -499,7 +499,7 @@
{
vb->sdi &= ~CSR9_MMC;
__vb_setctl(vb, 0x0048, vb->sdi);
- while(count--) {
+ while (count--) {
if (bits & (1 << count)) {
vb->sdi |= CSR9_MDO;
} else {
@@ -516,7 +516,7 @@
unsigned int bits=0;
vb->sdi |= CSR9_MMC;
__vb_setctl(vb, 0x0048, vb->sdi);
- while(count--) {
+ while (count--) {
bits <<= 1;
if (__vb_sdi_clk(vb))
bits |= 1;
@@ -904,7 +904,7 @@
*/
start_vb_deferred(vb);
/* Ensure that all the rx slots are ready for a buffer. */
- for ( i = 0; i < DRING_SIZE; ++i) {
+ for (i = 0; i < DRING_SIZE; ++i) {
vbb = voicebus_alloc(vb);
if (unlikely(NULL == vbb)) {
BUG_ON(1);
@@ -915,7 +915,7 @@
}
}
- for ( i=0; i < vb->min_tx_buffer_count; ++i) {
+ for (i=0; i < vb->min_tx_buffer_count; ++i) {
vbb = voicebus_alloc(vb);
if (unlikely(NULL == vbb)) {
BUG_ON(1);
@@ -1129,10 +1129,10 @@
start_vb_deferred(vb);
if (unlikely(stopping)) {
- while((vbb = vb_get_completed_txb(vb))) {
+ while ((vbb = vb_get_completed_txb(vb))) {
voicebus_free(vb, vbb);
}
- while((vbb = vb_get_completed_rxb(vb))) {
+ while ((vbb = vb_get_completed_rxb(vb))) {
voicebus_free(vb, vbb);
}
stop_vb_deferred(vb);
@@ -1216,7 +1216,7 @@
/* ******************************************************** */
/* ABNORMAL / ERROR CONDITIONS */
/* ******************************************************** */
- if ((int_status & TX_UNAVAILABLE_INTERRUPT) ) {
+ if ((int_status & TX_UNAVAILABLE_INTERRUPT)) {
/* This can happen if the host fails to service the
* interrupt within the required time interval (1ms
* for each buffer on the queue). Increasing the
@@ -1423,7 +1423,7 @@
goto cleanup;
}
vb->iobase = pci_resource_start(pdev, 0);
- if(NULL == request_region(vb->iobase, 0xff, board_name)) {
+ if (NULL == request_region(vb->iobase, 0xff, board_name)) {
VB_PRINTK(vb, ERR, "IO Registers are in use by another " \
"module.\n");
retval = -EIO;
More information about the svn-commits
mailing list