From 8f8e6b1d2372500155497267d7e5cd49a6d161b4 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Fri, 24 Feb 2012 12:10:15 +0100
Subject: [PATCH] --- yaml --- r: 295289 b: refs/heads/master c:
 82af3a4e9e37eee7680cd4c6fa5d31e6cbcbb05b h: refs/heads/master i:   295287:
 eb6d7f6f130d38a358bdcc9cba82259b9e1b561f v: v3

---
 [refs]                               |  2 +-
 trunk/arch/ia64/hp/sim/boot/fw-emu.c | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index aaac0983e6ee..434328bf5cc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48e30fa0738be3688f655632d917498464019e60
+refs/heads/master: 82af3a4e9e37eee7680cd4c6fa5d31e6cbcbb05b
diff --git a/trunk/arch/ia64/hp/sim/boot/fw-emu.c b/trunk/arch/ia64/hp/sim/boot/fw-emu.c
index bf6d9d8c802f..0216e28300fa 100644
--- a/trunk/arch/ia64/hp/sim/boot/fw-emu.c
+++ b/trunk/arch/ia64/hp/sim/boot/fw-emu.c
@@ -160,28 +160,19 @@ sal_emulator (long index, unsigned long in1, unsigned long in2,
 	 */
 	status = 0;
 	if (index == SAL_FREQ_BASE) {
-		switch (in1) {
-		      case SAL_FREQ_BASE_PLATFORM:
+		if (in1 == SAL_FREQ_BASE_PLATFORM)
 			r9 = 200000000;
-			break;
-
-		      case SAL_FREQ_BASE_INTERVAL_TIMER:
+		else if (in1 == SAL_FREQ_BASE_INTERVAL_TIMER) {
 			/*
 			 * Is this supposed to be the cr.itc frequency
 			 * or something platform specific?  The SAL
 			 * doc ain't exactly clear on this...
 			 */
 			r9 = 700000000;
-			break;
-
-		      case SAL_FREQ_BASE_REALTIME_CLOCK:
+		} else if (in1 == SAL_FREQ_BASE_REALTIME_CLOCK)
 			r9 = 1;
-			break;
-
-		      default:
+		else
 			status = -1;
-			break;
-		}
 	} else if (index == SAL_SET_VECTORS) {
 		;
 	} else if (index == SAL_GET_STATE_INFO) {