aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-09-08 06:45:59 -0400
committerChristoffer Dall <christoffer.dall@linaro.org>2016-09-08 06:54:00 -0400
commit5d947a1447f98eede0778f6f59a8fe03f0c53caf (patch)
treefab133316b8da1d0ccae0159f7979a2f563b72a0
parent3272f0d08e4490b792b99cf6034a2bb859bf6c9f (diff)
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>
-rw-r--r--virt/kvm/arm/arch_timer.c6
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)
445 if (err) { 445 if (err) {
446 kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n", 446 kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n",
447 host_vtimer_irq, err); 447 host_vtimer_irq, err);
448 goto out; 448 return err;
449 } 449 }
450 450
451 kvm_info("virtual timer IRQ%d\n", host_vtimer_irq); 451 kvm_info("virtual timer IRQ%d\n", host_vtimer_irq);
@@ -453,10 +453,6 @@ int kvm_timer_hyp_init(void)
453 cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING, 453 cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,
454 "AP_KVM_ARM_TIMER_STARTING", kvm_timer_starting_cpu, 454 "AP_KVM_ARM_TIMER_STARTING", kvm_timer_starting_cpu,
455 kvm_timer_dying_cpu); 455 kvm_timer_dying_cpu);
456 goto out;
457out_free:
458 free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus());
459out:
460 return err; 456 return err;
461} 457}
462 458