diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2016-09-08 12:45:59 +0200 |
|---|---|---|
| committer |   Christoffer Dall <christoffer.dall@linaro.org> | 2016-09-08 12:54:00 +0200 |
| commit | 5d947a1447f98eede0778f6f59a8fe03f0c53caf (patch) | |
| tree | fab133316b8da1d0ccae0159f7979a2f563b72a0 /virt | |
| parent | arm64: KVM: Inject a vSerror if detecting a bad GICV access at EL2 (diff) | |
| download | wireguard-linux-5d947a1447f98eede0778f6f59a8fe03f0c53caf.tar.xz wireguard-linux-5d947a1447f98eede0778f6f59a8fe03f0c53caf.zip | |
KVM: ARM: cleanup kvm_timer_hyp_init
Remove two unnecessary labels now that kvm_timer_hyp_init is not
creating its own workqueue anymore.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 4309b60ebf17..27a1f6341d41 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -445,7 +445,7 @@ int kvm_timer_hyp_init(void) if (err) { kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n", host_vtimer_irq, err); - goto out; + return err; } kvm_info("virtual timer IRQ%d\n", host_vtimer_irq); @@ -453,10 +453,6 @@ int kvm_timer_hyp_init(void) cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING, "AP_KVM_ARM_TIMER_STARTING", kvm_timer_starting_cpu, kvm_timer_dying_cpu); - goto out; -out_free: - free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus()); -out: return err; } |