diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:01:47 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:22 -0400 |
commit | 346050952cac11b25a98c7e1743412b416827314 (patch) | |
tree | ee12dd7bcc25082b851626f4848bae224e3c0a23 /include/asm-x86/byteorder.h | |
parent | 86d8a08616ecbc510323bfca591816a5709c6e54 (diff) |
include/asm-x86/byteorder.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/byteorder.h')
-rw-r--r-- | include/asm-x86/byteorder.h | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/include/asm-x86/byteorder.h b/include/asm-x86/byteorder.h index fe2f2e5d51ba..e02ae2d89acf 100644 --- a/include/asm-x86/byteorder.h +++ b/include/asm-x86/byteorder.h | |||
@@ -8,50 +8,59 @@ | |||
8 | 8 | ||
9 | #ifdef __i386__ | 9 | #ifdef __i386__ |
10 | 10 | ||
11 | static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) | 11 | static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) |
12 | { | 12 | { |
13 | #ifdef CONFIG_X86_BSWAP | 13 | #ifdef CONFIG_X86_BSWAP |
14 | __asm__("bswap %0" : "=r" (x) : "0" (x)); | 14 | asm("bswap %0" : "=r" (x) : "0" (x)); |
15 | #else | 15 | #else |
16 | __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */ | 16 | asm("xchgb %b0,%h0\n\t" /* swap lower bytes */ |
17 | "rorl $16,%0\n\t" /* swap words */ | 17 | "rorl $16,%0\n\t" /* swap words */ |
18 | "xchgb %b0,%h0" /* swap higher bytes */ | 18 | "xchgb %b0,%h0" /* swap higher bytes */ |
19 | :"=q" (x) | 19 | : "=q" (x) |
20 | : "0" (x)); | 20 | : "0" (x)); |
21 | #endif | 21 | #endif |
22 | return x; | 22 | return x; |
23 | } | 23 | } |
24 | 24 | ||
25 | static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val) | 25 | static inline __attribute_const__ __u64 ___arch__swab64(__u64 val) |
26 | { | 26 | { |
27 | union { | 27 | union { |
28 | struct { __u32 a,b; } s; | 28 | struct { |
29 | __u32 a; | ||
30 | __u32 b; | ||
31 | } s; | ||
29 | __u64 u; | 32 | __u64 u; |
30 | } v; | 33 | } v; |
31 | v.u = val; | 34 | v.u = val; |
32 | #ifdef CONFIG_X86_BSWAP | 35 | #ifdef CONFIG_X86_BSWAP |
33 | __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" | 36 | asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" |
34 | : "=r" (v.s.a), "=r" (v.s.b) | 37 | : "=r" (v.s.a), "=r" (v.s.b) |
35 | : "0" (v.s.a), "1" (v.s.b)); | 38 | : "0" (v.s.a), "1" (v.s.b)); |
36 | #else | 39 | #else |
37 | v.s.a = ___arch__swab32(v.s.a); | 40 | v.s.a = ___arch__swab32(v.s.a); |
38 | v.s.b = ___arch__swab32(v.s.b); | 41 | v.s.b = ___arch__swab32(v.s.b); |
39 | __asm__("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); | 42 | asm("xchgl %0,%1" |
43 | : "=r" (v.s.a), "=r" (v.s.b) | ||
44 | : "0" (v.s.a), "1" (v.s.b)); | ||
40 | #endif | 45 | #endif |
41 | return v.u; | 46 | return v.u; |
42 | } | 47 | } |
43 | 48 | ||
44 | #else /* __i386__ */ | 49 | #else /* __i386__ */ |
45 | 50 | ||
46 | static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) | 51 | static inline __attribute_const__ __u64 ___arch__swab64(__u64 x) |
47 | { | 52 | { |
48 | __asm__("bswapq %0" : "=r" (x) : "0" (x)); | 53 | asm("bswapq %0" |
54 | : "=r" (x) | ||
55 | : "0" (x)); | ||
49 | return x; | 56 | return x; |
50 | } | 57 | } |
51 | 58 | ||
52 | static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) | 59 | static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) |
53 | { | 60 | { |
54 | __asm__("bswapl %0" : "=r" (x) : "0" (x)); | 61 | asm("bswapl %0" |
62 | : "=r" (x) | ||
63 | : "0" (x)); | ||
55 | return x; | 64 | return x; |
56 | } | 65 | } |
57 | 66 | ||