summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2009-03-11 14:50:53 +0000
committerShaun Ruffell <sruffell@digium.com>2009-03-11 14:50:53 +0000
commit0f1c9a8ca73fae4f5b29d980cec152e8269bb5a6 (patch)
tree097cf45da6200bd6c6074558efdb3b8e3a1e0cdf
parent33a198e84b9742c9e15b953f901bf002ba6ec857 (diff)
Adding spaces around some other operators and moving 'inline' keyword.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6123 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/voicebus.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/dahdi/voicebus.c b/drivers/dahdi/voicebus.c
index 9091e93..b184a1a 100644
--- a/drivers/dahdi/voicebus.c
+++ b/drivers/dahdi/voicebus.c
@@ -429,7 +429,7 @@ vb_cleanup_descriptors(struct voicebus *vb, struct voicebus_descriptor_list *dl)
assert(vb_is_stopped(vb));
- for (i=0; i < DRING_SIZE; ++i) {
+ for (i = 0; i < DRING_SIZE; ++i) {
d = vb_descriptor(dl, i);
if (d->buffer1) {
d->buffer1 = 0;
@@ -489,7 +489,7 @@ __vb_sdi_clk(struct voicebus *vb)
ret = __vb_getctl(vb, 0x0048);
vb->sdi |= CSR9_MDC;
__vb_setctl(vb, 0x0048, vb->sdi);
- return (ret & CSR9_MDI) ? 1: 0;
+ return (ret & CSR9_MDI) ? 1 : 0;
}
static void
@@ -512,7 +512,7 @@ __vb_sdi_sendbits(struct voicebus *vb, u32 bits, int count)
static unsigned int
__vb_sdi_recvbits(struct voicebus *vb, int count)
{
- unsigned int bits=0;
+ unsigned int bits = 0;
vb->sdi |= CSR9_MMC;
__vb_setctl(vb, 0x0048, vb->sdi);
while (count--) {
@@ -795,7 +795,7 @@ voicebus_free(struct voicebus *vb, void *vbb)
/*!
* \brief Instruct the hardware to check for a new tx descriptor.
*/
-inline static void
+static inline void
__vb_tx_demand_poll(struct voicebus *vb)
{
__vb_setctl(vb, 0x0008, 0x00000000);
@@ -818,7 +818,7 @@ vb_tx_demand_poll(struct voicebus *vb)
* \brief Command the hardware to check if it owns the next receive
* descriptor.
*/
-inline static void
+static inline void
__vb_rx_demand_poll(struct voicebus *vb)
{
__vb_setctl(vb, 0x0010, 0x00000000);
@@ -912,7 +912,7 @@ voicebus_start(struct voicebus *vb)
}
}
- 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))
@@ -1018,8 +1018,7 @@ voicebus_stop(struct voicebus *vb)
#endif
assert(vb_is_stopped(vb));
clear_bit(STOP, &vb->flags);
- }
- else {
+ } else {
VB_PRINTK(vb, WARNING, "Timeout while waiting for board to "\
"stop.\n");
}