Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 04b18ff9ca69545a2447462a65c7ba5373e23f69

Authored by Akinobu Mita
Committed by Linus Torvalds
1 parent 63e424c844
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

arm: use asm-generic/bitops/le.h 

The previous style change enables to use asm-generic/bitops/le.h on arm.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 38 deletions Side-by-side Diff

arch/arm/include/asm/bitops.h
Diff comments   View file @ 04b18ff
... ... @@ -203,8 +203,6 @@
203 203 #define find_first_bit(p,sz) _find_first_bit_le(p,sz)
204 204 #define find_next_bit(p,sz,off) _find_next_bit_le(p,sz,off)
205 205  
206   -#define WORD_BITOFF_TO_LE(x) ((x))
207   -
208 206 #else
209 207 /*
210 208 * These are the big endian, atomic definitions.
... ... @@ -214,8 +212,6 @@
214 212 #define find_first_bit(p,sz) _find_first_bit_be(p,sz)
215 213 #define find_next_bit(p,sz,off) _find_next_bit_be(p,sz,off)
216 214  
217   -#define WORD_BITOFF_TO_LE(x) ((x) ^ 0x18)
218   -
219 215 #endif
220 216  
221 217 #if __LINUX_ARM_ARCH__ < 5
222 218  
... ... @@ -287,41 +283,8 @@
287 283 #include <asm-generic/bitops/hweight.h>
288 284 #include <asm-generic/bitops/lock.h>
289 285  
290   -static inline void __set_bit_le(int nr, void *addr)
291   -{
292   - __set_bit(WORD_BITOFF_TO_LE(nr), addr);
293   -}
  286 +#ifdef __ARMEB__
294 287  
295   -static inline void __clear_bit_le(int nr, void *addr)
296   -{
297   - __clear_bit(WORD_BITOFF_TO_LE(nr), addr);
298   -}
299   -
300   -static inline int __test_and_set_bit_le(int nr, void *addr)
301   -{
302   - return __test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr);
303   -}
304   -
305   -static inline int test_and_set_bit_le(int nr, void *addr)
306   -{
307   - return test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr);
308   -}
309   -
310   -static inline int __test_and_clear_bit_le(int nr, void *addr)
311   -{
312   - return __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr);
313   -}
314   -
315   -static inline int test_and_clear_bit_le(int nr, void *addr)
316   -{
317   - return test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr);
318   -}
319   -
320   -static inline int test_bit_le(int nr, const void *addr)
321   -{
322   - return test_bit(WORD_BITOFF_TO_LE(nr), addr);
323   -}
324   -
325 288 static inline int find_first_zero_bit_le(const void *p, unsigned size)
326 289 {
327 290 return _find_first_zero_bit_le(p, size);
... ... @@ -339,6 +302,10 @@
339 302 return _find_next_bit_le(p, size, offset);
340 303 }
341 304 #define find_next_bit_le find_next_bit_le
  305 +
  306 +#endif
  307 +
  308 +#include <asm-generic/bitops/le.h>
342 309  
343 310 /*
344 311 * Ext2 is defined to use little-endian byte ordering.