[PATCH] ARM: bitops

Convert ARM bitop assembly to a macro.  All bitops follow the same
format, so it's silly duplicating the code when only one or two
instructions are different.

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

1 files changed, 2 insertions, 13 deletions

diff --git a/arch/arm/lib/testclearbit.S b/arch/arm/lib/testclearbit.S
index e07c5bd24307..2dcc4b16b68e 100644
--- a/arch/arm/lib/testclearbit.S
+++ b/arch/arm/lib/testclearbit.S
@@ -9,21 +9,10 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
+#include "bitops.h"
                 .text
 
 ENTRY(_test_and_clear_bit_be)
                 eor     r0, r0, #0x18           @ big endian byte ordering
 ENTRY(_test_and_clear_bit_le)
-                add     r1, r1, r0, lsr #3      @ Get byte offset
-                and     r3, r0, #7              @ Get bit offset
-                mov     r0, #1
-                save_and_disable_irqs ip, r2
-                ldrb    r2, [r1]
-                tst     r2, r0, lsl r3
-                bic     r2, r2, r0, lsl r3
-                strb    r2, [r1]
-                restore_irqs ip
-                moveq   r0, #0
-                RETINSTR(mov,pc,lr)
-
-
+        testop  bicne, strneb