aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbmixer.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/usb/usbmixer.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/usb/usbmixer.c')
-rw-r--r--sound/usb/usbmixer.c4
1 files changed, 2 insertions, 2 deletions
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 */
366inline static int get_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int *value) 366static 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
402inline static int set_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int value) 402static 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}