aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/trident
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/pci/trident
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/pci/trident')
-rw-r--r--sound/pci/trident/trident_main.c2
-rw-r--r--sound/pci/trident/trident_memory.c2
2 files changed, 2 insertions, 2 deletions
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 */
3207inline static void do_delay(trident_t *chip) 3207static 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 */
121inline static void *offset_ptr(trident_t *trident, int offset) 121static 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));