KVM: x86/mmu: Remove superfluous gotos from mmu_topup_memory_caches()

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

No functional change intended.

Reviewed-by: Ben Gardon <bgardon@google.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200703023545.8771-5-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 26f0c82..7fae1c3 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -1101,13 +1101,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)