* [PATCH] KVM: ARM: cleanup kvm_timer_hyp_init
@ 2016-09-08 10:45 Paolo Bonzini
2016-09-08 10:54 ` Christoffer Dall
0 siblings, 1 reply; 2+ messages in thread
From: Paolo Bonzini @ 2016-09-08 10:45 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: Christoffer Dall, Marc Zyngier, Paolo Bonzini,
Radim Krčmář,
moderated list:KERNEL VIRTUAL MACHINE (KVM) FOR ARM,
open list:KERNEL VIRTUAL MACHINE (KVM) FOR ARM
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>
---
virt/kvm/arm/arch_timer.c | 6 +-----
1 file changed, 1 insertion(+), 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;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: ARM: cleanup kvm_timer_hyp_init
2016-09-08 10:45 [PATCH] KVM: ARM: cleanup kvm_timer_hyp_init Paolo Bonzini
@ 2016-09-08 10:54 ` Christoffer Dall
0 siblings, 0 replies; 2+ messages in thread
From: Christoffer Dall @ 2016-09-08 10:54 UTC (permalink / raw)
To: Paolo Bonzini
Cc: linux-kernel, kvm, Marc Zyngier, Radim Krčmář,
moderated list:KERNEL VIRTUAL MACHINE (KVM) FOR ARM,
open list:KERNEL VIRTUAL MACHINE (KVM) FOR ARM
On Thu, Sep 08, 2016 at 12:45:59PM +0200, Paolo Bonzini wrote:
> 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>
Thanks, applied.
-Christoffer
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-08 10:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-08 10:45 [PATCH] KVM: ARM: cleanup kvm_timer_hyp_init Paolo Bonzini
2016-09-08 10:54 ` Christoffer Dall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).