diff options
author | Jesper Juhl <juhl@dif.dk> | 2005-07-27 14:46:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:20 -0400 |
commit | 77933d7276ee8fa0e2947641941a6f7a100a327b (patch) | |
tree | e3a42724642410f5257c794a71b34642092eedd5 /sound | |
parent | 03e259a9cdbd0583e71468293aaa1ccadbdaeff1 (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')
-rw-r--r-- | sound/core/seq/oss/seq_oss_device.h | 6 | ||||
-rw-r--r-- | sound/core/seq/seq_memory.c | 4 | ||||
-rw-r--r-- | sound/core/seq/seq_midi_event.c | 2 | ||||
-rw-r--r-- | sound/drivers/serial-u16550.c | 10 | ||||
-rw-r--r-- | sound/isa/sb/emu8000_patch.c | 2 | ||||
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 4 | ||||
-rw-r--r-- | sound/pci/cmipci.c | 14 | ||||
-rw-r--r-- | sound/pci/cs4281.c | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/memory.c | 2 | ||||
-rw-r--r-- | sound/pci/es1968.c | 12 | ||||
-rw-r--r-- | sound/pci/maestro3.c | 8 | ||||
-rw-r--r-- | sound/pci/nm256/nm256.c | 16 | ||||
-rw-r--r-- | sound/pci/trident/trident_main.c | 2 | ||||
-rw-r--r-- | sound/pci/trident/trident_memory.c | 2 | ||||
-rw-r--r-- | sound/pci/vx222/vx222_ops.c | 4 | ||||
-rw-r--r-- | sound/pcmcia/vx/vxp_ops.c | 2 | ||||
-rw-r--r-- | sound/ppc/burgundy.c | 4 | ||||
-rw-r--r-- | sound/ppc/pmac.c | 8 | ||||
-rw-r--r-- | sound/usb/usbaudio.c | 8 | ||||
-rw-r--r-- | sound/usb/usbmixer.c | 4 |
20 files changed, 59 insertions, 57 deletions
diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h index da23c4db8dd5..973786758c55 100644 --- a/sound/core/seq/oss/seq_oss_device.h +++ b/sound/core/seq/oss/seq_oss_device.h | |||
@@ -158,21 +158,21 @@ void snd_seq_oss_readq_info_read(seq_oss_readq_t *q, snd_info_buffer_t *buf); | |||
158 | #define is_nonblock_mode(mode) ((mode) & SNDRV_SEQ_OSS_FILE_NONBLOCK) | 158 | #define is_nonblock_mode(mode) ((mode) & SNDRV_SEQ_OSS_FILE_NONBLOCK) |
159 | 159 | ||
160 | /* dispatch event */ | 160 | /* dispatch event */ |
161 | inline static int | 161 | static inline int |
162 | snd_seq_oss_dispatch(seq_oss_devinfo_t *dp, snd_seq_event_t *ev, int atomic, int hop) | 162 | snd_seq_oss_dispatch(seq_oss_devinfo_t *dp, snd_seq_event_t *ev, int atomic, int hop) |
163 | { | 163 | { |
164 | return snd_seq_kernel_client_dispatch(dp->cseq, ev, atomic, hop); | 164 | return snd_seq_kernel_client_dispatch(dp->cseq, ev, atomic, hop); |
165 | } | 165 | } |
166 | 166 | ||
167 | /* ioctl */ | 167 | /* ioctl */ |
168 | inline static int | 168 | static inline int |
169 | snd_seq_oss_control(seq_oss_devinfo_t *dp, unsigned int type, void *arg) | 169 | snd_seq_oss_control(seq_oss_devinfo_t *dp, unsigned int type, void *arg) |
170 | { | 170 | { |
171 | return snd_seq_kernel_client_ctl(dp->cseq, type, arg); | 171 | return snd_seq_kernel_client_ctl(dp->cseq, type, arg); |
172 | } | 172 | } |
173 | 173 | ||
174 | /* fill the addresses in header */ | 174 | /* fill the addresses in header */ |
175 | inline static void | 175 | static inline void |
176 | snd_seq_oss_fill_addr(seq_oss_devinfo_t *dp, snd_seq_event_t *ev, | 176 | snd_seq_oss_fill_addr(seq_oss_devinfo_t *dp, snd_seq_event_t *ev, |
177 | int dest_client, int dest_port) | 177 | int dest_client, int dest_port) |
178 | { | 178 | { |
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 00d841e82fbc..03acb2d519ba 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c | |||
@@ -36,12 +36,12 @@ | |||
36 | #define semaphore_of(fp) ((fp)->f_dentry->d_inode->i_sem) | 36 | #define semaphore_of(fp) ((fp)->f_dentry->d_inode->i_sem) |
37 | 37 | ||
38 | 38 | ||
39 | inline static int snd_seq_pool_available(pool_t *pool) | 39 | static inline int snd_seq_pool_available(pool_t *pool) |
40 | { | 40 | { |
41 | return pool->total_elements - atomic_read(&pool->counter); | 41 | return pool->total_elements - atomic_read(&pool->counter); |
42 | } | 42 | } |
43 | 43 | ||
44 | inline static int snd_seq_output_ok(pool_t *pool) | 44 | static inline int snd_seq_output_ok(pool_t *pool) |
45 | { | 45 | { |
46 | return snd_seq_pool_available(pool) >= pool->room; | 46 | return snd_seq_pool_available(pool) >= pool->room; |
47 | } | 47 | } |
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c index df1e2bb39745..603b63716db6 100644 --- a/sound/core/seq/seq_midi_event.c +++ b/sound/core/seq/seq_midi_event.c | |||
@@ -146,7 +146,7 @@ void snd_midi_event_free(snd_midi_event_t *dev) | |||
146 | /* | 146 | /* |
147 | * initialize record | 147 | * initialize record |
148 | */ | 148 | */ |
149 | inline static void reset_encode(snd_midi_event_t *dev) | 149 | static inline void reset_encode(snd_midi_event_t *dev) |
150 | { | 150 | { |
151 | dev->read = 0; | 151 | dev->read = 0; |
152 | dev->qlen = 0; | 152 | dev->qlen = 0; |
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 | ||
169 | static snd_card_t *snd_serial_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; | 169 | static snd_card_t *snd_serial_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; |
170 | 170 | ||
171 | inline static void snd_uart16550_add_timer(snd_uart16550_t *uart) | 171 | static 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 | ||
181 | inline static void snd_uart16550_del_timer(snd_uart16550_t *uart) | 181 | static 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 */ |
190 | inline static void snd_uart16550_buffer_output(snd_uart16550_t *uart) | 190 | static 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 | ||
582 | inline static int snd_uart16550_buffer_can_write( snd_uart16550_t *uart, int Num ) | 582 | static 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 | ||
590 | inline static int snd_uart16550_write_buffer(snd_uart16550_t *uart, unsigned char byte) | 590 | static 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 ) { |
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c index 4afc4a1bc140..26e693078cb3 100644 --- a/sound/isa/sb/emu8000_patch.c +++ b/sound/isa/sb/emu8000_patch.c | |||
@@ -128,7 +128,7 @@ snd_emu8000_write_wait(emu8000_t *emu) | |||
128 | * This is therefore much slower than need be, but is at least | 128 | * This is therefore much slower than need be, but is at least |
129 | * working. | 129 | * working. |
130 | */ | 130 | */ |
131 | inline static void | 131 | static inline void |
132 | write_word(emu8000_t *emu, int *offset, unsigned short data) | 132 | write_word(emu8000_t *emu, int *offset, unsigned short data) |
133 | { | 133 | { |
134 | if (emu8000_reset_addr) { | 134 | if (emu8000_reset_addr) { |
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 2704e1598add..2ceb46f1d40f 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -1557,7 +1557,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when) | |||
1557 | /* All the burgundy functions: */ | 1557 | /* All the burgundy functions: */ |
1558 | 1558 | ||
1559 | /* Waits for busy flag to clear */ | 1559 | /* Waits for busy flag to clear */ |
1560 | inline static void | 1560 | static inline void |
1561 | awacs_burgundy_busy_wait(void) | 1561 | awacs_burgundy_busy_wait(void) |
1562 | { | 1562 | { |
1563 | int count = 50; /* > 2 samples at 44k1 */ | 1563 | int count = 50; /* > 2 samples at 44k1 */ |
@@ -1565,7 +1565,7 @@ awacs_burgundy_busy_wait(void) | |||
1565 | udelay(1) ; | 1565 | udelay(1) ; |
1566 | } | 1566 | } |
1567 | 1567 | ||
1568 | inline static void | 1568 | static inline void |
1569 | awacs_burgundy_extend_wait(void) | 1569 | awacs_burgundy_extend_wait(void) |
1570 | { | 1570 | { |
1571 | int count = 50 ; /* > 2 samples at 44k1 */ | 1571 | int count = 50 ; /* > 2 samples at 44k1 */ |
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index b4503385ea69..4725b4a010be 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
@@ -488,32 +488,34 @@ struct snd_stru_cmipci { | |||
488 | 488 | ||
489 | 489 | ||
490 | /* read/write operations for dword register */ | 490 | /* read/write operations for dword register */ |
491 | inline static void snd_cmipci_write(cmipci_t *cm, unsigned int cmd, unsigned int data) | 491 | static inline void snd_cmipci_write(cmipci_t *cm, unsigned int cmd, unsigned int data) |
492 | { | 492 | { |
493 | outl(data, cm->iobase + cmd); | 493 | outl(data, cm->iobase + cmd); |
494 | } | 494 | } |
495 | inline static unsigned int snd_cmipci_read(cmipci_t *cm, unsigned int cmd) | 495 | |
496 | static inline unsigned int snd_cmipci_read(cmipci_t *cm, unsigned int cmd) | ||
496 | { | 497 | { |
497 | return inl(cm->iobase + cmd); | 498 | return inl(cm->iobase + cmd); |
498 | } | 499 | } |
499 | 500 | ||
500 | /* read/write operations for word register */ | 501 | /* read/write operations for word register */ |
501 | inline static void snd_cmipci_write_w(cmipci_t *cm, unsigned int cmd, unsigned short data) | 502 | static inline void snd_cmipci_write_w(cmipci_t *cm, unsigned int cmd, unsigned short data) |
502 | { | 503 | { |
503 | outw(data, cm->iobase + cmd); | 504 | outw(data, cm->iobase + cmd); |
504 | } | 505 | } |
505 | inline static unsigned short snd_cmipci_read_w(cmipci_t *cm, unsigned int cmd) | 506 | |
507 | static inline unsigned short snd_cmipci_read_w(cmipci_t *cm, unsigned int cmd) | ||
506 | { | 508 | { |
507 | return inw(cm->iobase + cmd); | 509 | return inw(cm->iobase + cmd); |
508 | } | 510 | } |
509 | 511 | ||
510 | /* read/write operations for byte register */ | 512 | /* read/write operations for byte register */ |
511 | inline static void snd_cmipci_write_b(cmipci_t *cm, unsigned int cmd, unsigned char data) | 513 | static inline void snd_cmipci_write_b(cmipci_t *cm, unsigned int cmd, unsigned char data) |
512 | { | 514 | { |
513 | outb(data, cm->iobase + cmd); | 515 | outb(data, cm->iobase + cmd); |
514 | } | 516 | } |
515 | 517 | ||
516 | inline static unsigned char snd_cmipci_read_b(cmipci_t *cm, unsigned int cmd) | 518 | static inline unsigned char snd_cmipci_read_b(cmipci_t *cm, unsigned int cmd) |
517 | { | 519 | { |
518 | return inb(cm->iobase + cmd); | 520 | return inb(cm->iobase + cmd); |
519 | } | 521 | } |
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index eb3c52b03af3..c7a370d4f923 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
@@ -542,7 +542,7 @@ static void snd_cs4281_delay(unsigned int delay) | |||
542 | } | 542 | } |
543 | } | 543 | } |
544 | 544 | ||
545 | inline static void snd_cs4281_delay_long(void) | 545 | static inline void snd_cs4281_delay_long(void) |
546 | { | 546 | { |
547 | set_current_state(TASK_UNINTERRUPTIBLE); | 547 | set_current_state(TASK_UNINTERRUPTIBLE); |
548 | schedule_timeout(1); | 548 | schedule_timeout(1); |
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 7a595f0dd7a1..6afeaeab3e13 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c | |||
@@ -495,7 +495,7 @@ static int synth_free_pages(emu10k1_t *emu, emu10k1_memblk_t *blk) | |||
495 | } | 495 | } |
496 | 496 | ||
497 | /* calculate buffer pointer from offset address */ | 497 | /* calculate buffer pointer from offset address */ |
498 | inline static void *offset_ptr(emu10k1_t *emu, int page, int offset) | 498 | static inline void *offset_ptr(emu10k1_t *emu, int page, int offset) |
499 | { | 499 | { |
500 | char *ptr; | 500 | char *ptr; |
501 | snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL); | 501 | snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL); |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index ea889b311390..327a341e276b 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -636,7 +636,7 @@ static void __maestro_write(es1968_t *chip, u16 reg, u16 data) | |||
636 | chip->maestro_map[reg] = data; | 636 | chip->maestro_map[reg] = data; |
637 | } | 637 | } |
638 | 638 | ||
639 | inline static void maestro_write(es1968_t *chip, u16 reg, u16 data) | 639 | static inline void maestro_write(es1968_t *chip, u16 reg, u16 data) |
640 | { | 640 | { |
641 | unsigned long flags; | 641 | unsigned long flags; |
642 | spin_lock_irqsave(&chip->reg_lock, flags); | 642 | spin_lock_irqsave(&chip->reg_lock, flags); |
@@ -654,7 +654,7 @@ static u16 __maestro_read(es1968_t *chip, u16 reg) | |||
654 | return chip->maestro_map[reg]; | 654 | return chip->maestro_map[reg]; |
655 | } | 655 | } |
656 | 656 | ||
657 | inline static u16 maestro_read(es1968_t *chip, u16 reg) | 657 | static inline u16 maestro_read(es1968_t *chip, u16 reg) |
658 | { | 658 | { |
659 | unsigned long flags; | 659 | unsigned long flags; |
660 | u16 result; | 660 | u16 result; |
@@ -755,7 +755,7 @@ static void __apu_set_register(es1968_t *chip, u16 channel, u8 reg, u16 data) | |||
755 | apu_data_set(chip, data); | 755 | apu_data_set(chip, data); |
756 | } | 756 | } |
757 | 757 | ||
758 | inline static void apu_set_register(es1968_t *chip, u16 channel, u8 reg, u16 data) | 758 | static inline void apu_set_register(es1968_t *chip, u16 channel, u8 reg, u16 data) |
759 | { | 759 | { |
760 | unsigned long flags; | 760 | unsigned long flags; |
761 | spin_lock_irqsave(&chip->reg_lock, flags); | 761 | spin_lock_irqsave(&chip->reg_lock, flags); |
@@ -771,7 +771,7 @@ static u16 __apu_get_register(es1968_t *chip, u16 channel, u8 reg) | |||
771 | return __maestro_read(chip, IDR0_DATA_PORT); | 771 | return __maestro_read(chip, IDR0_DATA_PORT); |
772 | } | 772 | } |
773 | 773 | ||
774 | inline static u16 apu_get_register(es1968_t *chip, u16 channel, u8 reg) | 774 | static inline u16 apu_get_register(es1968_t *chip, u16 channel, u8 reg) |
775 | { | 775 | { |
776 | unsigned long flags; | 776 | unsigned long flags; |
777 | u16 v; | 777 | u16 v; |
@@ -957,7 +957,7 @@ static u32 snd_es1968_compute_rate(es1968_t *chip, u32 freq) | |||
957 | } | 957 | } |
958 | 958 | ||
959 | /* get current pointer */ | 959 | /* get current pointer */ |
960 | inline static unsigned int | 960 | static inline unsigned int |
961 | snd_es1968_get_dma_ptr(es1968_t *chip, esschan_t *es) | 961 | snd_es1968_get_dma_ptr(es1968_t *chip, esschan_t *es) |
962 | { | 962 | { |
963 | unsigned int offset; | 963 | unsigned int offset; |
@@ -978,7 +978,7 @@ static void snd_es1968_apu_set_freq(es1968_t *chip, int apu, int freq) | |||
978 | } | 978 | } |
979 | 979 | ||
980 | /* spin lock held */ | 980 | /* spin lock held */ |
981 | inline static void snd_es1968_trigger_apu(es1968_t *esm, int apu, int mode) | 981 | static inline void snd_es1968_trigger_apu(es1968_t *esm, int apu, int mode) |
982 | { | 982 | { |
983 | /* set the APU mode */ | 983 | /* set the APU mode */ |
984 | __apu_set_register(esm, apu, 0, | 984 | __apu_set_register(esm, apu, 0, |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 096f15132853..52c585901c54 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -1055,22 +1055,22 @@ static struct m3_hv_quirk m3_hv_quirk_list[] = { | |||
1055 | schedule_timeout(((msec) * HZ) / 1000);\ | 1055 | schedule_timeout(((msec) * HZ) / 1000);\ |
1056 | } while (0) | 1056 | } while (0) |
1057 | 1057 | ||
1058 | inline static void snd_m3_outw(m3_t *chip, u16 value, unsigned long reg) | 1058 | static inline void snd_m3_outw(m3_t *chip, u16 value, unsigned long reg) |
1059 | { | 1059 | { |
1060 | outw(value, chip->iobase + reg); | 1060 | outw(value, chip->iobase + reg); |
1061 | } | 1061 | } |
1062 | 1062 | ||
1063 | inline static u16 snd_m3_inw(m3_t *chip, unsigned long reg) | 1063 | static inline u16 snd_m3_inw(m3_t *chip, unsigned long reg) |
1064 | { | 1064 | { |
1065 | return inw(chip->iobase + reg); | 1065 | return inw(chip->iobase + reg); |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | inline static void snd_m3_outb(m3_t *chip, u8 value, unsigned long reg) | 1068 | static inline void snd_m3_outb(m3_t *chip, u8 value, unsigned long reg) |
1069 | { | 1069 | { |
1070 | outb(value, chip->iobase + reg); | 1070 | outb(value, chip->iobase + reg); |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | inline static u8 snd_m3_inb(m3_t *chip, unsigned long reg) | 1073 | static inline u8 snd_m3_inb(m3_t *chip, unsigned long reg) |
1074 | { | 1074 | { |
1075 | return inb(chip->iobase + reg); | 1075 | return inb(chip->iobase + reg); |
1076 | } | 1076 | } |
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 8a52091f8552..7eb20b8f89f6 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c | |||
@@ -285,43 +285,43 @@ MODULE_DEVICE_TABLE(pci, snd_nm256_ids); | |||
285 | * lowlvel stuffs | 285 | * lowlvel stuffs |
286 | */ | 286 | */ |
287 | 287 | ||
288 | inline static u8 | 288 | static inline u8 |
289 | snd_nm256_readb(nm256_t *chip, int offset) | 289 | snd_nm256_readb(nm256_t *chip, int offset) |
290 | { | 290 | { |
291 | return readb(chip->cport + offset); | 291 | return readb(chip->cport + offset); |
292 | } | 292 | } |
293 | 293 | ||
294 | inline static u16 | 294 | static inline u16 |
295 | snd_nm256_readw(nm256_t *chip, int offset) | 295 | snd_nm256_readw(nm256_t *chip, int offset) |
296 | { | 296 | { |
297 | return readw(chip->cport + offset); | 297 | return readw(chip->cport + offset); |
298 | } | 298 | } |
299 | 299 | ||
300 | inline static u32 | 300 | static inline u32 |
301 | snd_nm256_readl(nm256_t *chip, int offset) | 301 | snd_nm256_readl(nm256_t *chip, int offset) |
302 | { | 302 | { |
303 | return readl(chip->cport + offset); | 303 | return readl(chip->cport + offset); |
304 | } | 304 | } |
305 | 305 | ||
306 | inline static void | 306 | static inline void |
307 | snd_nm256_writeb(nm256_t *chip, int offset, u8 val) | 307 | snd_nm256_writeb(nm256_t *chip, int offset, u8 val) |
308 | { | 308 | { |
309 | writeb(val, chip->cport + offset); | 309 | writeb(val, chip->cport + offset); |
310 | } | 310 | } |
311 | 311 | ||
312 | inline static void | 312 | static inline void |
313 | snd_nm256_writew(nm256_t *chip, int offset, u16 val) | 313 | snd_nm256_writew(nm256_t *chip, int offset, u16 val) |
314 | { | 314 | { |
315 | writew(val, chip->cport + offset); | 315 | writew(val, chip->cport + offset); |
316 | } | 316 | } |
317 | 317 | ||
318 | inline static void | 318 | static inline void |
319 | snd_nm256_writel(nm256_t *chip, int offset, u32 val) | 319 | snd_nm256_writel(nm256_t *chip, int offset, u32 val) |
320 | { | 320 | { |
321 | writel(val, chip->cport + offset); | 321 | writel(val, chip->cport + offset); |
322 | } | 322 | } |
323 | 323 | ||
324 | inline static void | 324 | static inline void |
325 | snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size) | 325 | snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size) |
326 | { | 326 | { |
327 | offset -= chip->buffer_start; | 327 | offset -= chip->buffer_start; |
@@ -926,7 +926,7 @@ snd_nm256_init_chip(nm256_t *chip) | |||
926 | } | 926 | } |
927 | 927 | ||
928 | 928 | ||
929 | inline static void | 929 | static inline void |
930 | snd_nm256_intr_check(nm256_t *chip) | 930 | snd_nm256_intr_check(nm256_t *chip) |
931 | { | 931 | { |
932 | if (chip->badintrcount++ > 1000) { | 932 | if (chip->badintrcount++ > 1000) { |
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index ccd5ca2ba16f..a09b0fb49e81 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c | |||
@@ -3204,7 +3204,7 @@ static inline void snd_trident_free_gameport(trident_t *chip) { } | |||
3204 | /* | 3204 | /* |
3205 | * delay for 1 tick | 3205 | * delay for 1 tick |
3206 | */ | 3206 | */ |
3207 | inline static void do_delay(trident_t *chip) | 3207 | static inline void do_delay(trident_t *chip) |
3208 | { | 3208 | { |
3209 | set_current_state(TASK_UNINTERRUPTIBLE); | 3209 | set_current_state(TASK_UNINTERRUPTIBLE); |
3210 | schedule_timeout(1); | 3210 | schedule_timeout(1); |
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c index 6cc282681e09..333d3790692a 100644 --- a/sound/pci/trident/trident_memory.c +++ b/sound/pci/trident/trident_memory.c | |||
@@ -118,7 +118,7 @@ static inline void set_silent_tlb(trident_t *trident, int page) | |||
118 | #endif /* PAGE_SIZE */ | 118 | #endif /* PAGE_SIZE */ |
119 | 119 | ||
120 | /* calculate buffer pointer from offset address */ | 120 | /* calculate buffer pointer from offset address */ |
121 | inline static void *offset_ptr(trident_t *trident, int offset) | 121 | static inline void *offset_ptr(trident_t *trident, int offset) |
122 | { | 122 | { |
123 | char *ptr; | 123 | char *ptr; |
124 | ptr = page_to_ptr(trident, get_aligned_page(offset)); | 124 | ptr = page_to_ptr(trident, get_aligned_page(offset)); |
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index 683e9799976f..967bd5e6b23c 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c | |||
@@ -82,7 +82,7 @@ static int vx2_reg_index[VX_REG_MAX] = { | |||
82 | [VX_GPIOC] = 0, /* on the PLX */ | 82 | [VX_GPIOC] = 0, /* on the PLX */ |
83 | }; | 83 | }; |
84 | 84 | ||
85 | inline static unsigned long vx2_reg_addr(vx_core_t *_chip, int reg) | 85 | static inline unsigned long vx2_reg_addr(vx_core_t *_chip, int reg) |
86 | { | 86 | { |
87 | struct snd_vx222 *chip = (struct snd_vx222 *)_chip; | 87 | struct snd_vx222 *chip = (struct snd_vx222 *)_chip; |
88 | return chip->port[vx2_reg_index[reg]] + vx2_reg_offset[reg]; | 88 | return chip->port[vx2_reg_index[reg]] + vx2_reg_offset[reg]; |
@@ -235,7 +235,7 @@ static void vx2_setup_pseudo_dma(vx_core_t *chip, int do_write) | |||
235 | /* | 235 | /* |
236 | * vx_release_pseudo_dma - disable the pseudo-DMA mode | 236 | * vx_release_pseudo_dma - disable the pseudo-DMA mode |
237 | */ | 237 | */ |
238 | inline static void vx2_release_pseudo_dma(vx_core_t *chip) | 238 | static inline void vx2_release_pseudo_dma(vx_core_t *chip) |
239 | { | 239 | { |
240 | /* HREQ pin disabled. */ | 240 | /* HREQ pin disabled. */ |
241 | vx_outl(chip, ICR, 0); | 241 | vx_outl(chip, ICR, 0); |
diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c index ef6734271607..6f15c3d03ab5 100644 --- a/sound/pcmcia/vx/vxp_ops.c +++ b/sound/pcmcia/vx/vxp_ops.c | |||
@@ -49,7 +49,7 @@ static int vxp_reg_offset[VX_REG_MAX] = { | |||
49 | }; | 49 | }; |
50 | 50 | ||
51 | 51 | ||
52 | inline static unsigned long vxp_reg_addr(vx_core_t *_chip, int reg) | 52 | static inline unsigned long vxp_reg_addr(vx_core_t *_chip, int reg) |
53 | { | 53 | { |
54 | struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip; | 54 | struct snd_vxpocket *chip = (struct snd_vxpocket *)_chip; |
55 | return chip->port + vxp_reg_offset[reg]; | 55 | return chip->port + vxp_reg_offset[reg]; |
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index 3f837d9f3eb1..edbc0484e22a 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | 31 | ||
32 | /* Waits for busy flag to clear */ | 32 | /* Waits for busy flag to clear */ |
33 | inline static void | 33 | static inline void |
34 | snd_pmac_burgundy_busy_wait(pmac_t *chip) | 34 | snd_pmac_burgundy_busy_wait(pmac_t *chip) |
35 | { | 35 | { |
36 | int timeout = 50; | 36 | int timeout = 50; |
@@ -40,7 +40,7 @@ snd_pmac_burgundy_busy_wait(pmac_t *chip) | |||
40 | printk(KERN_DEBUG "burgundy_busy_wait: timeout\n"); | 40 | printk(KERN_DEBUG "burgundy_busy_wait: timeout\n"); |
41 | } | 41 | } |
42 | 42 | ||
43 | inline static void | 43 | static inline void |
44 | snd_pmac_burgundy_extend_wait(pmac_t *chip) | 44 | snd_pmac_burgundy_extend_wait(pmac_t *chip) |
45 | { | 45 | { |
46 | int timeout; | 46 | int timeout; |
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 75b8b7423036..844d76152ea2 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -153,7 +153,7 @@ static pmac_stream_t *snd_pmac_get_stream(pmac_t *chip, int stream) | |||
153 | /* | 153 | /* |
154 | * wait while run status is on | 154 | * wait while run status is on |
155 | */ | 155 | */ |
156 | inline static void | 156 | static inline void |
157 | snd_pmac_wait_ack(pmac_stream_t *rec) | 157 | snd_pmac_wait_ack(pmac_stream_t *rec) |
158 | { | 158 | { |
159 | int timeout = 50000; | 159 | int timeout = 50000; |
@@ -177,7 +177,7 @@ static void snd_pmac_pcm_set_format(pmac_t *chip) | |||
177 | /* | 177 | /* |
178 | * stop the DMA transfer | 178 | * stop the DMA transfer |
179 | */ | 179 | */ |
180 | inline static void snd_pmac_dma_stop(pmac_stream_t *rec) | 180 | static inline void snd_pmac_dma_stop(pmac_stream_t *rec) |
181 | { | 181 | { |
182 | out_le32(&rec->dma->control, (RUN|WAKE|FLUSH|PAUSE) << 16); | 182 | out_le32(&rec->dma->control, (RUN|WAKE|FLUSH|PAUSE) << 16); |
183 | snd_pmac_wait_ack(rec); | 183 | snd_pmac_wait_ack(rec); |
@@ -186,7 +186,7 @@ inline static void snd_pmac_dma_stop(pmac_stream_t *rec) | |||
186 | /* | 186 | /* |
187 | * set the command pointer address | 187 | * set the command pointer address |
188 | */ | 188 | */ |
189 | inline static void snd_pmac_dma_set_command(pmac_stream_t *rec, pmac_dbdma_t *cmd) | 189 | static inline void snd_pmac_dma_set_command(pmac_stream_t *rec, pmac_dbdma_t *cmd) |
190 | { | 190 | { |
191 | out_le32(&rec->dma->cmdptr, cmd->addr); | 191 | out_le32(&rec->dma->cmdptr, cmd->addr); |
192 | } | 192 | } |
@@ -194,7 +194,7 @@ inline static void snd_pmac_dma_set_command(pmac_stream_t *rec, pmac_dbdma_t *cm | |||
194 | /* | 194 | /* |
195 | * start the DMA | 195 | * start the DMA |
196 | */ | 196 | */ |
197 | inline static void snd_pmac_dma_run(pmac_stream_t *rec, int status) | 197 | static inline void snd_pmac_dma_run(pmac_stream_t *rec, int status) |
198 | { | 198 | { |
199 | out_le32(&rec->dma->control, status | (status << 16)); | 199 | out_le32(&rec->dma->control, status | (status << 16)); |
200 | } | 200 | } |
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index a75695045f29..b5e734d975e0 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -212,7 +212,7 @@ static snd_usb_audio_t *usb_chip[SNDRV_CARDS]; | |||
212 | * convert a sampling rate into our full speed format (fs/1000 in Q16.16) | 212 | * convert a sampling rate into our full speed format (fs/1000 in Q16.16) |
213 | * this will overflow at approx 524 kHz | 213 | * this will overflow at approx 524 kHz |
214 | */ | 214 | */ |
215 | inline static unsigned get_usb_full_speed_rate(unsigned int rate) | 215 | static inline unsigned get_usb_full_speed_rate(unsigned int rate) |
216 | { | 216 | { |
217 | return ((rate << 13) + 62) / 125; | 217 | return ((rate << 13) + 62) / 125; |
218 | } | 218 | } |
@@ -221,19 +221,19 @@ inline static unsigned get_usb_full_speed_rate(unsigned int rate) | |||
221 | * convert a sampling rate into USB high speed format (fs/8000 in Q16.16) | 221 | * convert a sampling rate into USB high speed format (fs/8000 in Q16.16) |
222 | * this will overflow at approx 4 MHz | 222 | * this will overflow at approx 4 MHz |
223 | */ | 223 | */ |
224 | inline static unsigned get_usb_high_speed_rate(unsigned int rate) | 224 | static inline unsigned get_usb_high_speed_rate(unsigned int rate) |
225 | { | 225 | { |
226 | return ((rate << 10) + 62) / 125; | 226 | return ((rate << 10) + 62) / 125; |
227 | } | 227 | } |
228 | 228 | ||
229 | /* convert our full speed USB rate into sampling rate in Hz */ | 229 | /* convert our full speed USB rate into sampling rate in Hz */ |
230 | inline static unsigned get_full_speed_hz(unsigned int usb_rate) | 230 | static inline unsigned get_full_speed_hz(unsigned int usb_rate) |
231 | { | 231 | { |
232 | return (usb_rate * 125 + (1 << 12)) >> 13; | 232 | return (usb_rate * 125 + (1 << 12)) >> 13; |
233 | } | 233 | } |
234 | 234 | ||
235 | /* convert our high speed USB rate into sampling rate in Hz */ | 235 | /* convert our high speed USB rate into sampling rate in Hz */ |
236 | inline static unsigned get_high_speed_hz(unsigned int usb_rate) | 236 | static inline unsigned get_high_speed_hz(unsigned int usb_rate) |
237 | { | 237 | { |
238 | return (usb_rate * 125 + (1 << 9)) >> 10; | 238 | return (usb_rate * 125 + (1 << 9)) >> 10; |
239 | } | 239 | } |
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index e73c1c9d3e73..fa7056f5caaf 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
@@ -363,7 +363,7 @@ static int get_cur_ctl_value(usb_mixer_elem_info_t *cval, int validx, int *value | |||
363 | } | 363 | } |
364 | 364 | ||
365 | /* channel = 0: master, 1 = first channel */ | 365 | /* channel = 0: master, 1 = first channel */ |
366 | inline static int get_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int *value) | 366 | static inline int get_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int *value) |
367 | { | 367 | { |
368 | return get_ctl_value(cval, GET_CUR, (cval->control << 8) | channel, value); | 368 | return get_ctl_value(cval, GET_CUR, (cval->control << 8) | channel, value); |
369 | } | 369 | } |
@@ -399,7 +399,7 @@ static int set_cur_ctl_value(usb_mixer_elem_info_t *cval, int validx, int value) | |||
399 | return set_ctl_value(cval, SET_CUR, validx, value); | 399 | return set_ctl_value(cval, SET_CUR, validx, value); |
400 | } | 400 | } |
401 | 401 | ||
402 | inline static int set_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int value) | 402 | static inline int set_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int value) |
403 | { | 403 | { |
404 | return set_ctl_value(cval, SET_CUR, (cval->control << 8) | channel, value); | 404 | return set_ctl_value(cval, SET_CUR, (cval->control << 8) | channel, value); |
405 | } | 405 | } |