From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tiejun Chen Subject: [PATCH] kvm: x86: lapic: remove one redundant judging condition Date: Wed, 5 Nov 2014 17:03:05 +0800 Message-ID: <1415178185-11109-1-git-send-email-tiejun.chen@intel.com> Cc: kvm@vger.kernel.org To: pbonzini@redhat.com Return-path: Received: from mga11.intel.com ([192.55.52.93]:4086 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753495AbaKEJKG (ORCPT ); Wed, 5 Nov 2014 04:10:06 -0500 Sender: kvm-owner@vger.kernel.org List-ID: Finally we always return highest_irr so its unnecessary to return -1 after check if highest_irr == -1. Signed-off-by: Tiejun Chen --- arch/x86/kvm/lapic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 5f574b4..e6a7eb6 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1638,8 +1638,7 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu) apic_update_ppr(apic); highest_irr = apic_find_highest_irr(apic); - if ((highest_irr == -1) || - ((highest_irr & 0xF0) <= kvm_apic_get_reg(apic, APIC_PROCPRI))) + if ((highest_irr & 0xF0) <= kvm_apic_get_reg(apic, APIC_PROCPRI)) return -1; return highest_irr; } -- 1.9.1