diff options
| author | Sean Christopherson | 2020-02-03 10:42:00 -0800 |
|---|---|---|
| committer | Paolo Bonzini | 2020-02-05 15:29:55 +0100 |
| commit | 879a37632b403eb8c0fe00e14f907759100c8071 (patch) | |
| tree | 7bc4554e4c666d73f83d784a101ec7d094ca4af8 /arch | |
| parent | 09df6307125cec07ef9168f1db2ffdbbcb304b1a (diff) | |
KVM: MIPS: Fold comparecount_func() into comparecount_wakeup()
Fold kvm_mips_comparecount_func() into kvm_mips_comparecount_wakeup() to
eliminate the nondescript function name as well as its unnecessary cast
of a vcpu to "unsigned long" and back to a vcpu. Presumably func() was
used as a callback at some point during pre-upstream development, as
wakeup() is the only user of func() and has been the only user since
both with introduced by commit 669e846e6c4e ("KVM/MIPS32: MIPS arch
specific APIs for KVM").
Cc: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kvm/mips.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 92509041b954..71244bf87c3a 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -280,24 +280,19 @@ static inline void dump_handler(const char *symbol, void *start, void *end) pr_debug("\tEND(%s)\n", symbol); } -static void kvm_mips_comparecount_func(unsigned long data) +/* low level hrtimer wake routine */ +static enum hrtimer_restart kvm_mips_comparecount_wakeup(struct hrtimer *timer) { - struct kvm_vcpu *vcpu = (struct kvm_vcpu *)data; + struct kvm_vcpu *vcpu; + + vcpu = container_of(timer, struct kvm_vcpu, arch.comparecount_timer); kvm_mips_callbacks->queue_timer_int(vcpu); vcpu->arch.wait = 0; if (swq_has_sleeper(&vcpu->wq)) swake_up_one(&vcpu->wq); -} -/* low level hrtimer wake routine */ -static enum hrtimer_restart kvm_mips_comparecount_wakeup(struct hrtimer *timer) -{ - struct kvm_vcpu *vcpu; - - vcpu = container_of(timer, struct kvm_vcpu, arch.comparecount_timer); - kvm_mips_comparecount_func((unsigned long) vcpu); return kvm_mips_count_timeout(vcpu); } |