Skip to content

Commit

Permalink
MIPS: KVM: Remove redundant NULL checks before kfree()
Browse files Browse the repository at this point in the history
The kfree() function already NULL checks the parameter so remove the
redundant NULL checks before kfree() calls in arch/mips/kvm/.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: kvm@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: Sanjay Lal <sanjayl@kymasys.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
James Hogan authored and Paolo Bonzini committed May 30, 2014
1 parent 6e95bfd commit c6c0a66
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions arch/mips/kvm/kvm_mips.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,7 @@ void kvm_mips_free_vcpus(struct kvm *kvm)
if (kvm->arch.guest_pmap[i] != KVM_INVALID_PAGE)
kvm_mips_release_pfn_clean(kvm->arch.guest_pmap[i]);
}

if (kvm->arch.guest_pmap)
kfree(kvm->arch.guest_pmap);
kfree(kvm->arch.guest_pmap);

kvm_for_each_vcpu(i, vcpu, kvm) {
kvm_arch_vcpu_free(vcpu);
Expand Down Expand Up @@ -384,12 +382,8 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)

kvm_mips_dump_stats(vcpu);

if (vcpu->arch.guest_ebase)
kfree(vcpu->arch.guest_ebase);

if (vcpu->arch.kseg0_commpage)
kfree(vcpu->arch.kseg0_commpage);

kfree(vcpu->arch.guest_ebase);
kfree(vcpu->arch.kseg0_commpage);
}

void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
Expand Down

0 comments on commit c6c0a66

Please sign in to comment.