aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/sound/vx_core.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index a7e29933f2d0..7a60a3888667 100644
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -233,37 +233,37 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev, struct pt_regs *regs);
233/* 233/*
234 * lowlevel functions 234 * lowlevel functions
235 */ 235 */
236inline static int vx_test_and_ack(vx_core_t *chip) 236static inline int vx_test_and_ack(vx_core_t *chip)
237{ 237{
238 snd_assert(chip->ops->test_and_ack, return -ENXIO); 238 snd_assert(chip->ops->test_and_ack, return -ENXIO);
239 return chip->ops->test_and_ack(chip); 239 return chip->ops->test_and_ack(chip);
240} 240}
241 241
242inline static void vx_validate_irq(vx_core_t *chip, int enable) 242static inline void vx_validate_irq(vx_core_t *chip, int enable)
243{ 243{
244 snd_assert(chip->ops->validate_irq, return); 244 snd_assert(chip->ops->validate_irq, return);
245 chip->ops->validate_irq(chip, enable); 245 chip->ops->validate_irq(chip, enable);
246} 246}
247 247
248inline static unsigned char snd_vx_inb(vx_core_t *chip, int reg) 248static inline unsigned char snd_vx_inb(vx_core_t *chip, int reg)
249{ 249{
250 snd_assert(chip->ops->in8, return 0); 250 snd_assert(chip->ops->in8, return 0);
251 return chip->ops->in8(chip, reg); 251 return chip->ops->in8(chip, reg);
252} 252}
253 253
254inline static unsigned int snd_vx_inl(vx_core_t *chip, int reg) 254static inline unsigned int snd_vx_inl(vx_core_t *chip, int reg)
255{ 255{
256 snd_assert(chip->ops->in32, return 0); 256 snd_assert(chip->ops->in32, return 0);
257 return chip->ops->in32(chip, reg); 257 return chip->ops->in32(chip, reg);
258} 258}
259 259
260inline static void snd_vx_outb(vx_core_t *chip, int reg, unsigned char val) 260static inline void snd_vx_outb(vx_core_t *chip, int reg, unsigned char val)
261{ 261{
262 snd_assert(chip->ops->out8, return); 262 snd_assert(chip->ops->out8, return);
263 chip->ops->out8(chip, reg, val); 263 chip->ops->out8(chip, reg, val);
264} 264}
265 265
266inline static void snd_vx_outl(vx_core_t *chip, int reg, unsigned int val) 266static inline void snd_vx_outl(vx_core_t *chip, int reg, unsigned int val)
267{ 267{
268 snd_assert(chip->ops->out32, return); 268 snd_assert(chip->ops->out32, return);
269 chip->ops->out32(chip, reg, val); 269 chip->ops->out32(chip, reg, val);
@@ -303,14 +303,14 @@ int snd_vx_check_reg_bit(vx_core_t *chip, int reg, int mask, int bit, int time);
303/* 303/*
304 * pseudo-DMA transfer 304 * pseudo-DMA transfer
305 */ 305 */
306inline static void vx_pseudo_dma_write(vx_core_t *chip, snd_pcm_runtime_t *runtime, 306static inline void vx_pseudo_dma_write(vx_core_t *chip, snd_pcm_runtime_t *runtime,
307 vx_pipe_t *pipe, int count) 307 vx_pipe_t *pipe, int count)
308{ 308{
309 snd_assert(chip->ops->dma_write, return); 309 snd_assert(chip->ops->dma_write, return);
310 chip->ops->dma_write(chip, runtime, pipe, count); 310 chip->ops->dma_write(chip, runtime, pipe, count);
311} 311}
312 312
313inline static void vx_pseudo_dma_read(vx_core_t *chip, snd_pcm_runtime_t *runtime, 313static inline void vx_pseudo_dma_read(vx_core_t *chip, snd_pcm_runtime_t *runtime,
314 vx_pipe_t *pipe, int count) 314 vx_pipe_t *pipe, int count)
315{ 315{
316 snd_assert(chip->ops->dma_read, return); 316 snd_assert(chip->ops->dma_read, return);