aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/serial-u16550.c
diff options
context:
space:
mode:
authorJesper Juhl <juhl@dif.dk>2005-07-27 14:46:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 19:26:20 -0400
commit77933d7276ee8fa0e2947641941a6f7a100a327b (patch)
treee3a42724642410f5257c794a71b34642092eedd5 /sound/drivers/serial-u16550.c
parent03e259a9cdbd0583e71468293aaa1ccadbdaeff1 (diff)
[PATCH] clean up inline static vs static inline
`gcc -W' likes to complain if the static keyword is not at the beginning of the declaration. This patch fixes all remaining occurrences of "inline static" up with "static inline" in the entire kernel tree (140 occurrences in 47 files). While making this change I came across a few lines with trailing whitespace that I also fixed up, I have also added or removed a blank line or two here and there, but there are no functional changes in the patch. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/drivers/serial-u16550.c')
-rw-r--r--sound/drivers/serial-u16550.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 964b97e70c84..986df35fb829 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -168,7 +168,7 @@ typedef struct _snd_uart16550 {
168 168
169static snd_card_t *snd_serial_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 169static snd_card_t *snd_serial_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
170 170
171inline static void snd_uart16550_add_timer(snd_uart16550_t *uart) 171static inline void snd_uart16550_add_timer(snd_uart16550_t *uart)
172{ 172{
173 if (! uart->timer_running) { 173 if (! uart->timer_running) {
174 /* timer 38600bps * 10bit * 16byte */ 174 /* timer 38600bps * 10bit * 16byte */
@@ -178,7 +178,7 @@ inline static void snd_uart16550_add_timer(snd_uart16550_t *uart)
178 } 178 }
179} 179}
180 180
181inline static void snd_uart16550_del_timer(snd_uart16550_t *uart) 181static inline void snd_uart16550_del_timer(snd_uart16550_t *uart)
182{ 182{
183 if (uart->timer_running) { 183 if (uart->timer_running) {
184 del_timer(&uart->buffer_timer); 184 del_timer(&uart->buffer_timer);
@@ -187,7 +187,7 @@ inline static void snd_uart16550_del_timer(snd_uart16550_t *uart)
187} 187}
188 188
189/* This macro is only used in snd_uart16550_io_loop */ 189/* This macro is only used in snd_uart16550_io_loop */
190inline static void snd_uart16550_buffer_output(snd_uart16550_t *uart) 190static inline void snd_uart16550_buffer_output(snd_uart16550_t *uart)
191{ 191{
192 unsigned short buff_out = uart->buff_out; 192 unsigned short buff_out = uart->buff_out;
193 if( uart->buff_in_count > 0 ) { 193 if( uart->buff_in_count > 0 ) {
@@ -579,7 +579,7 @@ static int snd_uart16550_output_close(snd_rawmidi_substream_t * substream)
579 return 0; 579 return 0;
580}; 580};
581 581
582inline static int snd_uart16550_buffer_can_write( snd_uart16550_t *uart, int Num ) 582static inline int snd_uart16550_buffer_can_write( snd_uart16550_t *uart, int Num )
583{ 583{
584 if( uart->buff_in_count + Num < TX_BUFF_SIZE ) 584 if( uart->buff_in_count + Num < TX_BUFF_SIZE )
585 return 1; 585 return 1;
@@ -587,7 +587,7 @@ inline static int snd_uart16550_buffer_can_write( snd_uart16550_t *uart, int Num
587 return 0; 587 return 0;
588} 588}
589 589
590inline static int snd_uart16550_write_buffer(snd_uart16550_t *uart, unsigned char byte) 590static inline int snd_uart16550_write_buffer(snd_uart16550_t *uart, unsigned char byte)
591{ 591{
592 unsigned short buff_in = uart->buff_in; 592 unsigned short buff_in = uart->buff_in;
593 if( uart->buff_in_count < TX_BUFF_SIZE ) { 593 if( uart->buff_in_count < TX_BUFF_SIZE ) {