diff options
author | Jesper Juhl <juhl@dif.dk> | 2005-07-27 14:46:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:20 -0400 |
commit | 77933d7276ee8fa0e2947641941a6f7a100a327b (patch) | |
tree | e3a42724642410f5257c794a71b34642092eedd5 /drivers/ide/pci/cmd640.c | |
parent | 03e259a9cdbd0583e71468293aaa1ccadbdaeff1 (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 'drivers/ide/pci/cmd640.c')
-rw-r--r-- | drivers/ide/pci/cmd640.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c index 92a2b7caed58..11d035f1983d 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c | |||
@@ -487,7 +487,7 @@ static void display_clocks (unsigned int index) | |||
487 | * Pack active and recovery counts into single byte representation | 487 | * Pack active and recovery counts into single byte representation |
488 | * used by controller | 488 | * used by controller |
489 | */ | 489 | */ |
490 | inline static u8 pack_nibbles (u8 upper, u8 lower) | 490 | static inline u8 pack_nibbles (u8 upper, u8 lower) |
491 | { | 491 | { |
492 | return ((upper & 0x0f) << 4) | (lower & 0x0f); | 492 | return ((upper & 0x0f) << 4) | (lower & 0x0f); |
493 | } | 493 | } |