From e787d286e2dc3fc90538fd1b8a342fc7a432b16b Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cloudius-systems.com>
Date: Tue, 1 Oct 2013 09:54:19 +0300
Subject: [PATCH] kvmclock: Simplify probe() function
Make kvmclock::probe() easier to follow by simplifying the processor
feature checks.
Cc: Venkatesh Srinivas <venkateshs@google.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
drivers/kvmclock.cc | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/kvmclock.cc b/drivers/kvmclock.cc
index 13eefad41..b5052ad53 100644
--- a/drivers/kvmclock.cc
+++ b/drivers/kvmclock.cc
@@ -60,17 +60,14 @@ void kvmclock::setup_cpu()
bool kvmclock::probe()
{
- if (!processor::features().kvm_clocksource2 &&
- !processor::features().kvm_clocksource) {
- return false;
+ if (processor::features().kvm_clocksource2) {
+ return true;
}
-
- if (!processor::features().kvm_clocksource2 &&
- processor::features().kvm_clocksource) {
+ if (processor::features().kvm_clocksource) {
_new_kvmclock_msrs = false;
+ return true;
}
-
- return true;
+ return false;
}
s64 kvmclock::time()
--
GitLab