2.6.31 support (WiP)
[openwrt/staging/jow.git] / target / linux / coldfire / patches / 035-mcfv4e_bitops_cleanup.patch
1 From 898b269952d096ce3f990c51b02457c27e16b83c Mon Sep 17 00:00:00 2001
2 From: Kurt Mahan <kmahan@freescale.com>
3 Date: Sun, 9 Dec 2007 02:25:49 -0700
4 Subject: [PATCH] Clean up formatting.
5
6 LTIBName: mcfv4e-bitops-cleanup
7 Signed-off-by: Kurt Mahan <kmahan@freescale.com>
8 ---
9 include/asm-m68k/bitops.h | 21 ++++++++++++++-------
10 1 files changed, 14 insertions(+), 7 deletions(-)
11
12 --- a/include/asm-m68k/bitops.h
13 +++ b/include/asm-m68k/bitops.h
14 @@ -478,7 +478,8 @@ static __inline__ int __constant_coldfir
15 return retval;
16 }
17 #else
18 -static __inline__ int __constant_coldfire_test_and_set_bit(int nr,volatile void * vaddr)
19 +static __inline__ int __constant_coldfire_test_and_set_bit(int nr,
20 + volatile void *vaddr)
21 {
22 char retval;
23 volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
24 @@ -516,7 +517,8 @@ static __inline__ void __constant_coldfi
25 : "+QUd" (*p) : "di" (nr & 7));
26 }
27 #else
28 -static __inline__ void __constant_coldfire_set_bit(int nr, volatile void * vaddr)
29 +static __inline__ void __constant_coldfire_set_bit(int nr,
30 + volatile void *vaddr)
31 {
32 volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
33 __asm__ __volatile__ ("bset %1,(%3)"
34 @@ -524,7 +526,8 @@ static __inline__ void __constant_coldfi
35 }
36 #endif
37
38 -static __inline__ void __generic_coldfire_set_bit(int nr, volatile void *vaddr)
39 +static __inline__ void __generic_coldfire_set_bit(int nr,
40 + volatile void *vaddr)
41 {
42 __asm__ __volatile__ ("bset %1,%0"
43 : "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
44 @@ -552,7 +555,8 @@ static __inline__ int __constant_coldfir
45 return retval;
46 }
47 #else
48 -static __inline__ int __constant_coldfire_test_and_clear_bit(int nr, volatile void *vaddr)
49 +static __inline__ int __constant_coldfire_test_and_clear_bit(int nr,
50 + volatile void *vaddr)
51 {
52 char retval;
53 volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
54 @@ -599,7 +603,8 @@ static __inline__ void __constant_coldfi
55 : "+QUd" (*p) : "id" (nr & 7));
56 }
57 #else
58 -static __inline__ void __constant_coldfire_clear_bit(int nr, volatile void * vaddr)
59 +static __inline__ void __constant_coldfire_clear_bit(int nr,
60 + volatile void *vaddr)
61 {
62 volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
63 __asm__ __volatile__ ("bclr %1,(%3)"
64 @@ -636,7 +641,8 @@ static __inline__ int __constant_coldfir
65 return retval;
66 }
67 #else
68 -static __inline__ int __constant_coldfire_test_and_change_bit(int nr, volatile void * vaddr)
69 +static __inline__ int __constant_coldfire_test_and_change_bit(int nr,
70 + volatile void *vaddr)
71 {
72 char retval;
73 volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
74 @@ -678,7 +684,8 @@ static __inline__ void __constant_coldfi
75 : "+QUd" (*p) : "id" (nr & 7));
76 }
77 #else
78 -static __inline__ void __constant_coldfire_change_bit(int nr, volatile void * vaddr)
79 +static __inline__ void __constant_coldfire_change_bit(int nr,
80 + volatile void *vaddr)
81 {
82 volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
83 __asm__ __volatile__ ("bchg %1,(%3)"