From nobody Fri Sep 19 01:05:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CD7EC433FE for ; Wed, 30 Nov 2022 12:59:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232281AbiK3M7e (ORCPT ); Wed, 30 Nov 2022 07:59:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233835AbiK3M7b (ORCPT ); Wed, 30 Nov 2022 07:59:31 -0500 Received: from cmccmta3.chinamobile.com (cmccmta3.chinamobile.com [221.176.66.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9ECFA3723D for ; Wed, 30 Nov 2022 04:59:25 -0800 (PST) X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from spf.mail.chinamobile.com (unknown[172.16.121.9]) by rmmx-syy-dmz-app11-12011 (RichMail) with SMTP id 2eeb638753aa292-73599; Wed, 30 Nov 2022 20:59:23 +0800 (CST) X-RM-TRANSID: 2eeb638753aa292-73599 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[223.108.79.98]) by rmsmtp-syy-appsvr05-12005 (RichMail) with SMTP id 2ee5638753a2e34-1cfa8; Wed, 30 Nov 2022 20:59:22 +0800 (CST) X-RM-TRANSID: 2ee5638753a2e34-1cfa8 From: liujing To: pbonzini@redhat.com Cc: mingo@redhat.com, dave.hansen@linux.intel.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, liujing Subject: [PATCH] KVM: x86: Redundant variable assignments can be merged Date: Wed, 30 Nov 2022 07:59:13 -0500 Message-Id: <20221130125913.4605-1-liujing@cmss.chinamobile.com> X-Mailer: git-send-email 2.18.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When reading kvm code, find the 'r' variable declaration and then assign the value in kvm_vm_ioctl_get_irqchip and kvm_vm_ioctl_set_irqchip function, It can be combined into one sentence. Signed-off-by: liujing --- arch/x86/kvm/x86.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2835bd796639..4be353d5c09d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6002,9 +6002,8 @@ static unsigned long kvm_vm_ioctl_get_nr_mmu_pages(st= ruct kvm *kvm) static int kvm_vm_ioctl_get_irqchip(struct kvm *kvm, struct kvm_irqchip *c= hip) { struct kvm_pic *pic =3D kvm->arch.vpic; - int r; + int r =3D 0; =20 - r =3D 0; switch (chip->chip_id) { case KVM_IRQCHIP_PIC_MASTER: memcpy(&chip->chip.pic, &pic->pics[0], @@ -6027,9 +6026,8 @@ static int kvm_vm_ioctl_get_irqchip(struct kvm *kvm, = struct kvm_irqchip *chip) static int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *c= hip) { struct kvm_pic *pic =3D kvm->arch.vpic; - int r; + int r =3D 0; =20 - r =3D 0; switch (chip->chip_id) { case KVM_IRQCHIP_PIC_MASTER: spin_lock(&pic->lock); --=20 2.18.2