aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/cmipci.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/pci/cmipci.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/pci/cmipci.c')
-rw-r--r--sound/pci/cmipci.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index b4503385ea6..4725b4a010b 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 */
491inline static void snd_cmipci_write(cmipci_t *cm, unsigned int cmd, unsigned int data) 491static 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}
495inline static unsigned int snd_cmipci_read(cmipci_t *cm, unsigned int cmd) 495
496static 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 */
501inline static void snd_cmipci_write_w(cmipci_t *cm, unsigned int cmd, unsigned short data) 502static 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}
505inline static unsigned short snd_cmipci_read_w(cmipci_t *cm, unsigned int cmd) 506
507static 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 */
511inline static void snd_cmipci_write_b(cmipci_t *cm, unsigned int cmd, unsigned char data) 513static 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
516inline static unsigned char snd_cmipci_read_b(cmipci_t *cm, unsigned int cmd) 518static 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}