aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.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/usbaudio.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/usbaudio.c')
-rw-r--r--sound/usb/usbaudio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index a75695045f2..b5e734d975e 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 */
215inline static unsigned get_usb_full_speed_rate(unsigned int rate) 215static 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 */
224inline static unsigned get_usb_high_speed_rate(unsigned int rate) 224static 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 */
230inline static unsigned get_full_speed_hz(unsigned int usb_rate) 230static 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 */
236inline static unsigned get_high_speed_hz(unsigned int usb_rate) 236static 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}