]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: mvebu: Use a CR_C constant instead of a hard-coded one
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Mon, 10 Aug 2015 13:47:51 +0000 (15:47 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Tue, 29 Sep 2015 16:01:19 +0000 (18:01 +0200)
Fix the armada_370_xp_pmsu_idle_enter() function to use a CR_C
constant instead of a hard-coded constant in the assembly part.
This clean-up was suggested by Russell King.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm/mach-mvebu/pmsu.c

index e8fdb9ceedf0c7c9402bff4123ea9c375a1ccbfe..9658b5a11e384521f26519f65312957962b15107 100644 (file)
@@ -296,11 +296,11 @@ int armada_370_xp_pmsu_idle_enter(unsigned long deepidle)
        /* Test the CR_C bit and set it if it was cleared */
        asm volatile(
        "mrc    p15, 0, r0, c1, c0, 0 \n\t"
-       "tst    r0, #(1 << 2) \n\t"
+       "tst    r0, %0 \n\t"
        "orreq  r0, r0, #(1 << 2) \n\t"
        "mcreq  p15, 0, r0, c1, c0, 0 \n\t"
        "isb    "
-       : : : "r0");
+       : : "Ir" (CR_C) : "r0");
 
        pr_debug("Failed to suspend the system\n");