KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 1ec86d9e2a82a32b28cd175951048b3d2cef118e..06b7d8ae27e52240ed2670d0dae759165e48afb6 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -3624,11 +3624,9 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
                return -EIO;
 
        mutex_lock(&kvm->lock);
+       if (!kvm->arch.pimap)
+               goto unlock;
 
-       if (kvm->arch.pimap == NULL) {
-               mutex_unlock(&kvm->lock);
-               return 0;
-       }
        pimap = kvm->arch.pimap;
 
        for (i = 0; i < pimap->n_mapped; i++) {
@@ -3650,7 +3648,7 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
         * We don't free this structure even when the count goes to
         * zero. The structure is freed when we destroy the VM.
         */
-
+ unlock:
        mutex_unlock(&kvm->lock);
        return 0;
 }