Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f88839dd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-cleanup-4.4-1' of git://git.infradead.org/linux-mvebu into next/cleanup

Merge "mvebu cleanup for 4.4 (part 1)" from Gregory CLEMENT:

use the CR_C define instead of a literal value

* tag 'mvebu-cleanup-4.4-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Use a CR_C constant instead of a hard-coded one
parents 064ca93f 7ee20ff0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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");