[PATCH 04/11] KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Fri, 20 Jan 2017 11:00:08 +0100

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 <elfr...@users.sourceforge.net>
---
 arch/powerpc/kvm/book3s_hv.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index a93e1c4445da..cfc7699d05df 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -3509,11 +3509,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++) {
@@ -3535,7 +3533,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;
 }
-- 
2.11.0