Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6878715imu; Thu, 31 Jan 2019 00:57:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN7G3s5Chk9y/cISHvrBC50zTA7lzmO2rJaF7tM9F+It/rBuD5mUw+D+xARzPzKZa+1I1gj2 X-Received: by 2002:a63:4246:: with SMTP id p67mr30417025pga.335.1548925037568; Thu, 31 Jan 2019 00:57:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548925037; cv=none; d=google.com; s=arc-20160816; b=HTPUwc1HJ0XQbmLZ5TgESFgnwYFUBXzQ0/oFU7BTZVD12XRHCDj3lGzkYya8XX/mwu bpDRo6pt0OIejLWLYvxJ8TbFmN8h+CqVHDfUC3q0NOTYb+Wx99QHjIcq+q9luCVeGnIP V2N7+a++fstDIikLE4T/JlLU557gnaxLCTPvbferNcegVAwmLA4OOT/iSsvtfNAT1NrG DtQyjtujaYvwdlvjy2IllUMQrieruZ9LxViYX2MtGAN/zmRvfiPOF7cEBmRVAW0MYZFM FqyxOeVZC9NvazrjGC/K8u5inpHNtBVEouScEjdU9wfveoObtZvD6g776X36n574a1Ea SGLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=BuOzMDRVdTqNyGGRn2TxIB1xADyD3amijk0LOJpb0Dk=; b=RXRPeiDqRVN1qAM0GngtSdZ6qfnOuDPE9NwzP234d/nIecpPZ/O0ZXDUyGnn9oHi+g xzKsbbM9EmDUtggWgmlihh9t4nf2MFxYODKO1Xt9oEjqnPRt+fJjrIP06rBRG1K5RE7I cvmSJvT9wZJOIzFlNBzT6+HoQ1Q9n4u0mBrqzchkdqnEGr/JiwIvfTlyqVPh3cOaLWn+ BbinVOog4B6a0WN/YQV/SB99VlMQdKS6wcP043EshwxjaMSP0wbahJbQhRQpeZ0cUUG4 qpARPKybFlbrrwKmMK1xQaFhqDQXVD7r3WKF1gCoBHK99DTMu/ERR4oqYHV3BOJDTIqn fdTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z8si3733653pgf.577.2019.01.31.00.57.02; Thu, 31 Jan 2019 00:57:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731901AbfAaIzD (ORCPT + 99 others); Thu, 31 Jan 2019 03:55:03 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:37766 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729417AbfAaIxV (ORCPT ); Thu, 31 Jan 2019 03:53:21 -0500 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0V8hsxR082031 for ; Thu, 31 Jan 2019 03:53:18 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qbuc5eyd3-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 31 Jan 2019 03:53:18 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Jan 2019 08:53:16 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP 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 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0V8rBZT48693336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 31 Jan 2019 08:53:12 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CE26942045; Thu, 31 Jan 2019 08:53:11 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 621D942042; Thu, 31 Jan 2019 08:53:11 +0000 (GMT) Received: from s38lp84.lnxne.boe (unknown [9.152.108.100]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 31 Jan 2019 08:53:11 +0000 (GMT) From: Michael Mueller To: KVM Mailing List Cc: Linux-S390 Mailing List , linux-kernel@vger.kernel.org, Martin Schwidefsky , Heiko Carstens , Christian Borntraeger , Janosch Frank , David Hildenbrand , Cornelia Huck , Halil Pasic , Pierre Morel , Michael Mueller Subject: [PATCH v7 01/15] KVM: s390: drop obsolete else path Date: Thu, 31 Jan 2019 09:52:32 +0100 X-Mailer: git-send-email 2.13.4 In-Reply-To: <20190131085247.13826-1-mimu@linux.ibm.com> References: <20190131085247.13826-1-mimu@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19013108-0012-0000-0000-000002EF5617 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19013108-0013-0000-0000-00002126A04E Message-Id: <20190131085247.13826-2-mimu@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-31_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=839 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310070 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Cornelia Huck Reviewed-by: Halil Pasic --- 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; -- 2.13.4