[PATCH 04/21] KVM: x86/mmu: Remove superfluous gotos from mmu_topup_memory_caches()

From: Sean Christopherson
Date: Fri Jun 05 2020 - 17:39:58 EST


Return errors directly from mmu_topup_memory_caches() instead of
branching to a label that does the same.

No functional change intended.

Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
---
arch/x86/kvm/mmu/mmu.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 36c90f004ef4..ba70de24a5b0 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -1100,13 +1100,11 @@ static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu)
r = mmu_topup_memory_cache(&vcpu->arch.mmu_pte_list_desc_cache,
8 + PTE_PREFETCH_NUM);
if (r)
- goto out;
+ return r;
r = mmu_topup_memory_cache(&vcpu->arch.mmu_page_cache, 8);
if (r)
- goto out;
- r = mmu_topup_memory_cache(&vcpu->arch.mmu_page_header_cache, 4);
-out:
- return r;
+ return r;
+ return mmu_topup_memory_cache(&vcpu->arch.mmu_page_header_cache, 4);
}

static void mmu_free_memory_caches(struct kvm_vcpu *vcpu)
--
2.26.0