From 687ab2843de3d55391f06d3f87510d757fa39a7e Mon Sep 17 00:00:00 2001
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Tue, 2 Aug 2011 15:50:58 +0200
Subject: [PATCH] --- yaml --- r: 264301 b: refs/heads/master c:
 870168a031b3c5b78191d719d375221f01e98e11 h: refs/heads/master i:   264299:
 363f91c970d3c48409c8e1ace25f73ca3ac2f3f8 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/mips/alchemy/common/power.c | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4f693680dcb7..7de4640e1608 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c78c48827336b8aec2a5afcf249f0d0a7fe16859
+refs/heads/master: 870168a031b3c5b78191d719d375221f01e98e11
diff --git a/trunk/arch/mips/alchemy/common/power.c b/trunk/arch/mips/alchemy/common/power.c
index 647e518c90bc..b86324a42601 100644
--- a/trunk/arch/mips/alchemy/common/power.c
+++ b/trunk/arch/mips/alchemy/common/power.c
@@ -158,15 +158,21 @@ static void restore_core_regs(void)
 
 void au_sleep(void)
 {
-	int cpuid = alchemy_get_cputype();
-	if (cpuid != ALCHEMY_CPU_UNKNOWN) {
-		save_core_regs();
-		if (cpuid <= ALCHEMY_CPU_AU1500)
-			alchemy_sleep_au1000();
-		else if (cpuid <= ALCHEMY_CPU_AU1200)
-			alchemy_sleep_au1550();
-		restore_core_regs();
+	save_core_regs();
+
+	switch (alchemy_get_cputype()) {
+	case ALCHEMY_CPU_AU1000:
+	case ALCHEMY_CPU_AU1500:
+	case ALCHEMY_CPU_AU1100:
+		alchemy_sleep_au1000();
+		break;
+	case ALCHEMY_CPU_AU1550:
+	case ALCHEMY_CPU_AU1200:
+		alchemy_sleep_au1550();
+		break;
 	}
+
+	restore_core_regs();
 }
 
 #endif	/* CONFIG_PM */