Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7cb73730c85051e8fe53592ba3a92b899571ade4

Authored by Nathan Rossi
Committed by Michal Simek
1 parent 736d1746fb
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

microblaze: Fix style issues in header files 

Fix various style issues in MicroBlaze header files. Specifically fixing
style voilations including '__inline__', 'foo * bar' and 'void foo ('.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Showing 2 changed files with 34 additions and 34 deletions Side-by-side Diff

arch/microblaze/include/asm/bitops.h
Diff comments   View file @ 7cb7373
... ... @@ -21,31 +21,31 @@
21 21 * The __ functions are not atomic
22 22 */
23 23  
24   -extern void set_bit(int nr, volatile void * addr);
25   -extern void __set_bit(int nr, volatile void * addr);
  24 +extern void set_bit(int nr, volatile void *addr);
  25 +extern void __set_bit(int nr, volatile void *addr);
26 26  
27   -extern void clear_bit(int nr, volatile void * addr);
  27 +extern void clear_bit(int nr, volatile void *addr);
28 28 #define __clear_bit(nr, addr) clear_bit(nr, addr)
29 29 #define PLATFORM__CLEAR_BIT
30 30  
31   -extern void change_bit(int nr, volatile void * addr);
32   -extern void __change_bit(int nr, volatile void * addr);
33   -extern int test_and_set_bit(int nr, volatile void * addr);
34   -extern int __test_and_set_bit(int nr, volatile void * addr);
35   -extern int test_and_clear_bit(int nr, volatile void * addr);
36   -extern int __test_and_clear_bit(int nr, volatile void * addr);
37   -extern int test_and_change_bit(int nr, volatile void * addr);
38   -extern int __test_and_change_bit(int nr, volatile void * addr);
39   -extern int __constant_test_bit(int nr, const volatile void * addr);
40   -extern int __test_bit(int nr, volatile void * addr);
41   -extern int find_first_zero_bit(void * addr, unsigned size);
42   -extern int find_next_zero_bit (void * addr, int size, int offset);
  31 +extern void change_bit(int nr, volatile void *addr);
  32 +extern void __change_bit(int nr, volatile void *addr);
  33 +extern int test_and_set_bit(int nr, volatile void *addr);
  34 +extern int __test_and_set_bit(int nr, volatile void *addr);
  35 +extern int test_and_clear_bit(int nr, volatile void *addr);
  36 +extern int __test_and_clear_bit(int nr, volatile void *addr);
  37 +extern int test_and_change_bit(int nr, volatile void *addr);
  38 +extern int __test_and_change_bit(int nr, volatile void *addr);
  39 +extern int __constant_test_bit(int nr, const volatile void *addr);
  40 +extern int __test_bit(int nr, volatile void *addr);
  41 +extern int find_first_zero_bit(void *addr, unsigned size);
  42 +extern int find_next_zero_bit(void *addr, int size, int offset);
43 43  
44 44 /*
45 45 * ffz = Find First Zero in word. Undefined if no zero exists,
46 46 * so code should check against ~0UL first..
47 47 */
48   -extern __inline__ unsigned long ffz(unsigned long word)
  48 +extern inline unsigned long ffz(unsigned long word)
49 49 {
50 50 unsigned long result = 0;
51 51  
... ... @@ -57,7 +57,7 @@
57 57 }
58 58  
59 59  
60   -extern __inline__ void set_bit(int nr, volatile void * addr)
  60 +extern inline void set_bit(int nr, volatile void *addr)
61 61 {
62 62 int * a = (int *) addr;
63 63 int mask;
... ... @@ -70,7 +70,7 @@
70 70 restore_flags(flags);
71 71 }
72 72  
73   -extern __inline__ void __set_bit(int nr, volatile void * addr)
  73 +extern inline void __set_bit(int nr, volatile void *addr)
74 74 {
75 75 int * a = (int *) addr;
76 76 int mask;
... ... @@ -87,7 +87,7 @@
87 87 #define smp_mb__before_clear_bit() barrier()
88 88 #define smp_mb__after_clear_bit() barrier()
89 89  
90   -extern __inline__ void clear_bit(int nr, volatile void * addr)
  90 +extern inline void clear_bit(int nr, volatile void *addr)
91 91 {
92 92 int * a = (int *) addr;
93 93 int mask;
... ... @@ -100,7 +100,7 @@
100 100 restore_flags(flags);
101 101 }
102 102  
103   -extern __inline__ void change_bit(int nr, volatile void * addr)
  103 +extern inline void change_bit(int nr, volatile void *addr)
104 104 {
105 105 int mask;
106 106 unsigned long flags;
... ... @@ -113,7 +113,7 @@
113 113 restore_flags(flags);
114 114 }
115 115  
116   -extern __inline__ void __change_bit(int nr, volatile void * addr)
  116 +extern inline void __change_bit(int nr, volatile void *addr)
117 117 {
118 118 int mask;
119 119 unsigned long *ADDR = (unsigned long *) addr;
... ... @@ -123,7 +123,7 @@
123 123 *ADDR ^= mask;
124 124 }
125 125  
126   -extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
  126 +extern inline int test_and_set_bit(int nr, volatile void *addr)
127 127 {
128 128 int mask, retval;
129 129 volatile unsigned int *a = (volatile unsigned int *) addr;
... ... @@ -139,7 +139,7 @@
139 139 return retval;
140 140 }
141 141  
142   -extern __inline__ int __test_and_set_bit(int nr, volatile void * addr)
  142 +extern inline int __test_and_set_bit(int nr, volatile void *addr)
143 143 {
144 144 int mask, retval;
145 145 volatile unsigned int *a = (volatile unsigned int *) addr;
... ... @@ -151,7 +151,7 @@
151 151 return retval;
152 152 }
153 153  
154   -extern __inline__ int test_and_clear_bit(int nr, volatile void * addr)
  154 +extern inline int test_and_clear_bit(int nr, volatile void *addr)
155 155 {
156 156 int mask, retval;
157 157 volatile unsigned int *a = (volatile unsigned int *) addr;
... ... @@ -167,7 +167,7 @@
167 167 return retval;
168 168 }
169 169  
170   -extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr)
  170 +extern inline int __test_and_clear_bit(int nr, volatile void *addr)
171 171 {
172 172 int mask, retval;
173 173 volatile unsigned int *a = (volatile unsigned int *) addr;
... ... @@ -179,7 +179,7 @@
179 179 return retval;
180 180 }
181 181  
182   -extern __inline__ int test_and_change_bit(int nr, volatile void * addr)
  182 +extern inline int test_and_change_bit(int nr, volatile void *addr)
183 183 {
184 184 int mask, retval;
185 185 volatile unsigned int *a = (volatile unsigned int *) addr;
... ... @@ -195,7 +195,7 @@
195 195 return retval;
196 196 }
197 197  
198   -extern __inline__ int __test_and_change_bit(int nr, volatile void * addr)
  198 +extern inline int __test_and_change_bit(int nr, volatile void *addr)
199 199 {
200 200 int mask, retval;
201 201 volatile unsigned int *a = (volatile unsigned int *) addr;
202 202  
... ... @@ -210,12 +210,12 @@
210 210 /*
211 211 * This routine doesn't need to be atomic.
212 212 */
213   -extern __inline__ int __constant_test_bit(int nr, const volatile void * addr)
  213 +extern inline int __constant_test_bit(int nr, const volatile void *addr)
214 214 {
215 215 return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
216 216 }
217 217  
218   -extern __inline__ int __test_bit(int nr, volatile void * addr)
  218 +extern inline int __test_bit(int nr, volatile void *addr)
219 219 {
220 220 int * a = (int *) addr;
221 221 int mask;
... ... @@ -233,7 +233,7 @@
233 233 #define find_first_zero_bit(addr, size) \
234 234 find_next_zero_bit((addr), (size), 0)
235 235  
236   -extern __inline__ int find_next_zero_bit (void * addr, int size, int offset)
  236 +extern inline int find_next_zero_bit(void *addr, int size, int offset)
237 237 {
238 238 unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
239 239 unsigned long result = offset & ~31UL;
... ... @@ -279,7 +279,7 @@
279 279 #define hweight8(x) generic_hweight8(x)
280 280  
281 281  
282   -extern __inline__ int ext2_set_bit(int nr, volatile void * addr)
  282 +extern inline int ext2_set_bit(int nr, volatile void *addr)
283 283 {
284 284 int mask, retval;
285 285 unsigned long flags;
... ... @@ -294,7 +294,7 @@
294 294 return retval;
295 295 }
296 296  
297   -extern __inline__ int ext2_clear_bit(int nr, volatile void * addr)
  297 +extern inline int ext2_clear_bit(int nr, volatile void *addr)
298 298 {
299 299 int mask, retval;
300 300 unsigned long flags;
... ... @@ -309,7 +309,7 @@
309 309 return retval;
310 310 }
311 311  
312   -extern __inline__ int ext2_test_bit(int nr, const volatile void * addr)
  312 +extern inline int ext2_test_bit(int nr, const volatile void *addr)
313 313 {
314 314 int mask;
315 315 const volatile unsigned char *ADDR = (const unsigned char *) addr;
arch/microblaze/include/asm/system.h
Diff comments   View file @ 7cb7373
... ... @@ -131,7 +131,7 @@
131 131 ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr))))
132 132 #define tas(ptr) (xchg ((ptr), 1))
133 133  
134   -extern inline unsigned long __xchg (unsigned long with,
  134 +extern inline unsigned long __xchg(unsigned long with,
135 135 __volatile__ void *ptr, int size)
136 136 {
137 137 unsigned long tmp, flags;