[v7,01/15] KVM: s390: drop obsolete else path

Message ID	20190131085247.13826-2-mimu@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 <mimu@linux.ibm.com>; Thu, 31 Jan 2019 08:53:16 -0000 Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 31 Jan 2019 08:53:13 -0000 From: Michael Mueller <mimu@linux.ibm.com> To: KVM Mailing List <kvm@vger.kernel.org> Cc: Linux-S390 Mailing List <linux-s390@vger.kernel.org>, linux-kernel@vger.kernel.org, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Janosch Frank <frankja@linux.ibm.com>, David Hildenbrand <david@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Pierre Morel <pmorel@linux.ibm.com>, Michael Mueller <mimu@linux.ibm.com> Subject: [PATCH v7 01/15] KVM: s390: drop obsolete else path Date: Thu, 31 Jan 2019 09:52:32 +0100 In-Reply-To: <20190131085247.13826-1-mimu@linux.ibm.com> References: <20190131085247.13826-1-mimu@linux.ibm.com> Message-Id: <20190131085247.13826-2-mimu@linux.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: s390: make use of the GIB \| expand [v7,00/15] KVM: s390: make use of the GIB [v7,01/15] KVM: s390: drop obsolete else path [v7,02/15] KVM: s390: make bitmap declaration consistent [v7,03/15] KVM: s390: move bitmap idle_mask into arch struct top level [v7,04/15] KVM: s390: coding style kvm_s390_gisa_init/clear() [v7,05/15] KVM: s390: use pending_irqs_no_gisa() where appropriate [v7,06/15] KVM: s390: remove kvm_s390_ from gisa static inline functions [v7,07/15] KVM: s390: introduce struct kvm_s390_gisa_interrupt [v7,08/15] s390/cio: add function chsc_sgib() [v7,09/15] KVM: s390: add the GIB and its related life-cyle functions [v7,10/15] KVM: s390: add kvm reference to struct sie_page2 [v7,11/15] KVM: s390: add functions to (un)register GISC with GISA [v7,12/15] KVM: s390: kvm_s390_gisa_clear() now clears the IPM only [v7,13/15] KVM: s390: add gib_alert_irq_handler() [v7,14/15] KVM: s390: start using the GIB [v7,15/15] KVM: s390: test for non NULL gisa origin in pending_irqs()

Message ID

20190131085247.13826-2-mimu@linux.ibm.com (mailing list archive)

State

New, archived

Headers

From: Michael Mueller <mimu@linux.ibm.com>
To: KVM Mailing List <kvm@vger.kernel.org>
Cc: Linux-S390 Mailing List <linux-s390@vger.kernel.org>,
        linux-kernel@vger.kernel.org,
        Martin Schwidefsky <schwidefsky@de.ibm.com>,
        Heiko Carstens <heiko.carstens@de.ibm.com>,
        Christian Borntraeger <borntraeger@de.ibm.com>,
        Janosch Frank <frankja@linux.ibm.com>,
        David Hildenbrand <david@redhat.com>,
        Cornelia Huck <cohuck@redhat.com>,
        Halil Pasic <pasic@linux.ibm.com>,
        Pierre Morel <pmorel@linux.ibm.com>,
        Michael Mueller <mimu@linux.ibm.com>
Subject: [PATCH v7 01/15] KVM: s390: drop obsolete else path
Date: Thu, 31 Jan 2019 09:52:32 +0100
In-Reply-To: <20190131085247.13826-1-mimu@linux.ibm.com>
References: <20190131085247.13826-1-mimu@linux.ibm.com>
Message-Id: <20190131085247.13826-2-mimu@linux.ibm.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk

Series

KVM: s390: make use of the GIB | expand

Commit Message

Michael Mueller Jan. 31, 2019, 8:52 a.m. UTC

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>
---
 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 fcb55b02990e..19d556512452 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;

[v7,01/15] KVM: s390: drop obsolete else path

Commit Message

Patch