| Message ID | 20190911195235.29048-1-thuth@redhat.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | KVM: PPC: Remove superfluous check for non-zero return value | expand |
On Wed, 11 Sep 2019 21:52:35 +0200 Thomas Huth <thuth@redhat.com> 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 <thuth@redhat.com> > --- This looks like a good candidate for trivial, hence Cc'ing Jiri and adding trivial keyword in subject. Reviewed-by: Greg Kurz <groug@kaod.org> > 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; > } > > /*
On Wed, 18 Sep 2019 18:44:36 +0200 Greg Kurz <groug@kaod.org> wrote: > On Wed, 11 Sep 2019 21:52:35 +0200 > Thomas Huth <thuth@redhat.com> 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 <thuth@redhat.com> > > --- > > This looks like a good candidate for trivial, hence Cc'ing Jiri > and adding trivial keyword in subject. > > Reviewed-by: Greg Kurz <groug@kaod.org> > Oops, the patch is correct but there are some fixes that require the return 0 to stay around... https://patchwork.ozlabs.org/project/kvm-ppc/list/?series=129957 > > 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; > > } > > > > /* >
On 18/09/2019 22.54, Greg Kurz wrote: > On Wed, 18 Sep 2019 18:44:36 +0200 > Greg Kurz <groug@kaod.org> wrote: > >> On Wed, 11 Sep 2019 21:52:35 +0200 >> Thomas Huth <thuth@redhat.com> 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 <thuth@redhat.com> >>> --- >> >> This looks like a good candidate for trivial, hence Cc'ing Jiri >> and adding trivial keyword in subject. >> >> Reviewed-by: Greg Kurz <groug@kaod.org> >> > > Oops, the patch is correct but there are some fixes that require > the return 0 to stay around... > > https://patchwork.ozlabs.org/project/kvm-ppc/list/?series=129957 :-) Ok, then please simply ignore my patch. Thomas
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; } /*
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 <thuth@redhat.com> --- arch/powerpc/kvm/book3s_xive.c | 5 +---- arch/powerpc/kvm/book3s_xive_native.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-)