[GIT,PULL,02/18] KVM: s390: drop obsolete else path

Message ID	1550835749-26436-3-git-send-email-frankja@linux.ibm.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> Gateway: Authorized Use Only! Violators will be prosecuted for <kvm@vger.kernel.org> from <frankja@linux.ibm.com>; Fri, 22 Feb 2019 11:44:08 -0000 Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 22 Feb 2019 11:44:04 -0000 From: Janosch Frank <frankja@linux.ibm.com> To: pbonzini@redhat.com, rkrcmar@redhat.com Cc: borntraeger@de.ibm.com, kvm@vger.kernel.org, cohuck@redhat.com, linux-s390@vger.kernel.org, david@redhat.com, schwidefsky@de.ibm.com Subject: [GIT PULL 02/18] KVM: s390: drop obsolete else path Date: Fri, 22 Feb 2019 12:42:13 +0100 In-Reply-To: <1550835749-26436-1-git-send-email-frankja@linux.ibm.com> References: <1550835749-26436-1-git-send-email-frankja@linux.ibm.com> Message-Id: <1550835749-26436-3-git-send-email-frankja@linux.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	[GIT,PULL,01/18] KVM: s390: clarify kvm related kernel message \| expand [GIT,PULL,01/18] KVM: s390: clarify kvm related kernel message [GIT,PULL,02/18] KVM: s390: drop obsolete else path [GIT,PULL,03/18] KVM: s390: make bitmap declaration consistent [GIT,PULL,04/18] KVM: s390: move bitmap idle_mask into arch struct top level [GIT,PULL,05/18] KVM: s390: coding style kvm_s390_gisa_init/clear() [GIT,PULL,06/18] KVM: s390: use pending_irqs_no_gisa() where appropriate [GIT,PULL,07/18] KVM: s390: remove kvm_s390_ from gisa static inline functions [GIT,PULL,08/18] KVM: s390: introduce struct kvm_s390_gisa_interrupt [GIT,PULL,09/18] s390/cio: add function chsc_sgib() [GIT,PULL,10/18] KVM: s390: add the GIB and its related life-cyle functions [GIT,PULL,11/18] KVM: s390: add kvm reference to struct sie_page2 [GIT,PULL,12/18] KVM: s390: add functions to (un)register GISC with GISA [GIT,PULL,13/18] KVM: s390: kvm_s390_gisa_clear() now clears the IPM only [GIT,PULL,14/18] KVM: s390: add gib_alert_irq_handler() [GIT,PULL,15/18] KVM: s390: start using the GIB [GIT,PULL,16/18] KVM: s390: fix possible null pointer dereference in pending_irqs() [GIT,PULL,17/18] KVM: s390: implement subfunction processor calls [GIT,PULL,18/18] KVM: s390: add debug logging for cpu model subfunctions

Message ID

1550835749-26436-3-git-send-email-frankja@linux.ibm.com (mailing list archive)

State

New, archived

Headers

From: Janosch Frank <frankja@linux.ibm.com>
To: pbonzini@redhat.com, rkrcmar@redhat.com
Cc: borntraeger@de.ibm.com, kvm@vger.kernel.org, cohuck@redhat.com,
        linux-s390@vger.kernel.org, david@redhat.com,
        schwidefsky@de.ibm.com
Subject: [GIT PULL 02/18] KVM: s390: drop obsolete else path
Date: Fri, 22 Feb 2019 12:42:13 +0100
In-Reply-To: <1550835749-26436-1-git-send-email-frankja@linux.ibm.com>
References: <1550835749-26436-1-git-send-email-frankja@linux.ibm.com>
Message-Id: <1550835749-26436-3-git-send-email-frankja@linux.ibm.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk

Series

[GIT,PULL,01/18] KVM: s390: clarify kvm related kernel message | expand

Commit Message

Janosch Frank Feb. 22, 2019, 11:42 a.m. UTC

From: Michael Mueller <mimu@linux.ibm.com>

The explicit else path specified in set_intercept_indicators_io
is not required as the function returns in case the first branch
is taken anyway.

Signed-off-by: Michael Mueller <mimu@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Message-Id: <20190131085247.13826-2-mimu@linux.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/kvm/interrupt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index fcb55b0..19d5565 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -345,7 +345,7 @@  static void set_intercept_indicators_io(struct kvm_vcpu *vcpu)
 {
 	if (!(pending_irqs_no_gisa(vcpu) & IRQ_PEND_IO_MASK))
 		return;
-	else if (psw_ioint_disabled(vcpu))
+	if (psw_ioint_disabled(vcpu))
 		kvm_s390_set_cpuflags(vcpu, CPUSTAT_IO_INT);
 	else
 		vcpu->arch.sie_block->lctl |= LCTL_CR6;

[GIT,PULL,02/18] KVM: s390: drop obsolete else path

Commit Message

Patch