KVM: x86: cleanup return handling in setup_routing_entry()

Let's drop the goto and return the error value directly.

Suggested-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
index 3bcc9990adf7..cc30d01a56be 100644
--- a/virt/kvm/irqchip.c
+++ b/virt/kvm/irqchip.c
@@ -142,8 +142,8 @@ static int setup_routing_entry(struct kvm *kvm,
                                struct kvm_kernel_irq_routing_entry *e,
                                const struct kvm_irq_routing_entry *ue)
 {
-        int r = -EINVAL;
         struct kvm_kernel_irq_routing_entry *ei;
+        int r;
 
         /*
          * Do not allow GSI to be mapped to the same irqchip more than once.
@@ -153,20 +153,19 @@ static int setup_routing_entry(struct kvm *kvm,
                 if (ei->type != KVM_IRQ_ROUTING_IRQCHIP ||
                     ue->type != KVM_IRQ_ROUTING_IRQCHIP ||
                     ue->u.irqchip.irqchip == ei->irqchip.irqchip)
-                        return r;
+                        return -EINVAL;
 
         e->gsi = ue->gsi;
         e->type = ue->type;
         r = kvm_set_routing_entry(kvm, e, ue);
         if (r)
-                goto out;
+                return r;
         if (e->type == KVM_IRQ_ROUTING_IRQCHIP)
                 rt->chip[e->irqchip.irqchip][e->irqchip.pin] = e->gsi;
 
         hlist_add_head(&e->link, &rt->map[e->gsi]);
-        r = 0;
-out:
-        return r;
+
+        return 0;
 }
 
 void __attribute__((weak)) kvm_arch_irq_routing_update(struct kvm *kvm)