This replaces an open coded calculation to obtain the physical
address of a far symbol with a call to the new ldr_l etc macro.

Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 arch/arm/mach-mvebu/coherency_ll.S | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/arm/mach-mvebu/coherency_ll.S 
b/arch/arm/mach-mvebu/coherency_ll.S
index 8b2fbc8b6bc6..df0ccb5cef1d 100644
--- a/arch/arm/mach-mvebu/coherency_ll.S
+++ b/arch/arm/mach-mvebu/coherency_ll.S
@@ -42,9 +42,7 @@ ENTRY(ll_get_coherency_base)
        ldr     r1, =coherency_base
        cmp     r1, #0
        beq     2f
-       adr     r1, 3f
-       ldr     r3, [r1]
-       ldr     r1, [r1, r3]
+       ldr_l   r1, coherency_phys_base
        b       2f
 1:
        /*
@@ -160,7 +158,3 @@ ENTRY(ll_disable_coherency)
        dsb
        ret     lr
 ENDPROC(ll_disable_coherency)
-
-       .align 2
-3:
-       .long   coherency_phys_base - .
-- 
2.11.0

Reply via email to