From: Greg Kurz Date: Wed, 18 Sep 2019 16:44:36 +0000 Subject: Re: [PATCH trivial] KVM: PPC: Remove superfluous check for non-zero return value Message-Id: <20190918184436.5323298d@bahia.lan> List-Id: References: <20190911195235.29048-1-thuth@redhat.com> In-Reply-To: <20190911195235.29048-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Thomas Huth Cc: Paul Mackerras , kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Jiri Kosina On Wed, 11 Sep 2019 21:52:35 +0200 Thomas Huth wrote: > After the kfree()s haven been removed in the previous > commit 9798f4ea71ea ("fix rollback when kvmppc_xive_create fails"), > the code can be simplified even more to simply always "return ret" > now. > > Signed-off-by: Thomas Huth > --- This looks like a good candidate for trivial, hence Cc'ing Jiri and adding trivial keyword in subject. Reviewed-by: Greg Kurz > arch/powerpc/kvm/book3s_xive.c | 5 +---- > arch/powerpc/kvm/book3s_xive_native.c | 5 +---- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c > index e3ba67095895..2f6f463fcdfb 100644 > --- a/arch/powerpc/kvm/book3s_xive.c > +++ b/arch/powerpc/kvm/book3s_xive.c > @@ -1986,10 +1986,7 @@ static int kvmppc_xive_create(struct kvm_device *dev, u32 type) > > xive->single_escalation = xive_native_has_single_escalation(); > > - if (ret) > - return ret; > - > - return 0; > + return ret; > } > > int kvmppc_xive_debug_show_queues(struct seq_file *m, struct kvm_vcpu *vcpu) > diff --git a/arch/powerpc/kvm/book3s_xive_native.c b/arch/powerpc/kvm/book3s_xive_native.c > index a998823f68a3..7a50772f26fe 100644 > --- a/arch/powerpc/kvm/book3s_xive_native.c > +++ b/arch/powerpc/kvm/book3s_xive_native.c > @@ -1089,10 +1089,7 @@ static int kvmppc_xive_native_create(struct kvm_device *dev, u32 type) > xive->single_escalation = xive_native_has_single_escalation(); > xive->ops = &kvmppc_xive_native_ops; > > - if (ret) > - return ret; > - > - return 0; > + return ret; > } > > /*