diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
commit | 3516c6a8dc0b1153c611c4cf0dc4a51631f052bb (patch) | |
tree | c54a5fc916cbe73e43dee20902642f367f44a551 /drivers/staging/meilhaus/mecirc_buf.h | |
parent | 714f83d5d9f7c785f622259dad1f4fad12d64664 (diff) | |
parent | ba0e1ebb7ea0616eebc29d2077355bacea62a9d8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits)
Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
Staging: serqt_usb: fix build due to proc tty changes
Staging: serqt_usb: fix checkpatch errors
Staging: serqt_usb: add TODO file
Staging: serqt_usb: Lindent the code
Staging: add USB serial Quatech driver
staging: document that the wifi staging drivers a bit better
Staging: echo cleanup
Staging: BUG to BUG_ON changes
Staging: remove some pointless conditionals before kfree_skb()
Staging: line6: fix build error, select SND_RAWMIDI
Staging: line6: fix checkpatch errors in variax.c
Staging: line6: fix checkpatch errors in toneport.c
Staging: line6: fix checkpatch errors in pcm.c
Staging: line6: fix checkpatch errors in midibuf.c
Staging: line6: fix checkpatch errors in midi.c
Staging: line6: fix checkpatch errors in dumprequest.c
Staging: line6: fix checkpatch errors in driver.c
Staging: line6: fix checkpatch errors in audio.c
Staging: line6: fix checkpatch errors in pod.c
...
Diffstat (limited to 'drivers/staging/meilhaus/mecirc_buf.h')
-rw-r--r-- | drivers/staging/meilhaus/mecirc_buf.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/meilhaus/mecirc_buf.h b/drivers/staging/meilhaus/mecirc_buf.h index e9b591eaa34..516658522ef 100644 --- a/drivers/staging/meilhaus/mecirc_buf.h +++ b/drivers/staging/meilhaus/mecirc_buf.h @@ -40,19 +40,19 @@ typedef struct me_circ_buf { int volatile tail; } me_circ_buf_t; -static int inline me_circ_buf_values(me_circ_buf_t * buf) +static inline int me_circ_buf_values(me_circ_buf_t * buf) { // return ((buf->head - buf->tail) & (buf->count - 1)); return ((buf->head - buf->tail) & (buf->mask)); } -static int inline me_circ_buf_space(me_circ_buf_t * buf) +static inline int me_circ_buf_space(me_circ_buf_t * buf) { // return ((buf->tail - (buf->head + 1)) & (buf->count - 1)); return ((buf->tail - (buf->head + 1)) & (buf->mask)); } -static int inline me_circ_buf_values_to_end(me_circ_buf_t * buf) +static inline int me_circ_buf_values_to_end(me_circ_buf_t * buf) { int end; int n; @@ -63,7 +63,7 @@ static int inline me_circ_buf_values_to_end(me_circ_buf_t * buf) return (n < end) ? n : end; } -static int inline me_circ_buf_space_to_end(me_circ_buf_t * buf) +static inline int me_circ_buf_space_to_end(me_circ_buf_t * buf) { int end; int n; @@ -99,19 +99,19 @@ typedef struct me_circ_buf_16b { # endif //_CBUFF_32b_t /** How many values is in buffer */ -static int inline me_circ_buf_values(me_circ_buf_t * buf) +static inline int me_circ_buf_values(me_circ_buf_t * buf) { return ((buf->head - buf->tail) & (buf->mask)); } /** How many space left */ -static int inline me_circ_buf_space(me_circ_buf_t * buf) +static inline int me_circ_buf_space(me_circ_buf_t * buf) { return ((buf->tail - (buf->head + 1)) & (buf->mask)); } /** How many values can be read from buffor in one chunck. */ -static int inline me_circ_buf_values_to_end(me_circ_buf_t * buf) +static inline int me_circ_buf_values_to_end(me_circ_buf_t * buf) { return (buf->tail <= buf->head) ? (buf->head - buf->tail) : (buf->mask - buf->tail + @@ -119,7 +119,7 @@ static int inline me_circ_buf_values_to_end(me_circ_buf_t * buf) } /** How many values can be write to buffer in one chunck. */ -static int inline me_circ_buf_space_to_end(me_circ_buf_t * buf) +static inline int me_circ_buf_space_to_end(me_circ_buf_t * buf) { return (buf->tail <= buf->head) ? (buf->mask - buf->head + 1) : (buf->tail - |