ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines

The ARM arch_{read,write}_trylock implementations include unused
backwards branch labels, since we don't retry the locking operation
if the exclusive store fails.

This patch removes the labels.

Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h
index 0da2effd4b379a0d232d09633c8ab9c8be168c44..b4ca707d0a69f17bdf5d2f85ec7875e26654ac42 100644 (file)
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
@@ -182,7 +182,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)
        unsigned long tmp;
 
        __asm__ __volatile__(
-"1:    ldrex   %0, [%1]\n"
+"      ldrex   %0, [%1]\n"
 "      teq     %0, #0\n"
 "      strexeq %0, %2, [%1]"
        : "=&r" (tmp)
@@ -268,7 +268,7 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)
        unsigned long tmp, tmp2 = 1;
 
        __asm__ __volatile__(
-"1:    ldrex   %0, [%2]\n"
+"      ldrex   %0, [%2]\n"
 "      adds    %0, %0, #1\n"
 "      strexpl %1, %0, [%2]\n"
        : "=&r" (tmp), "+r" (tmp2)