KVM: MIPS: Fold comparecount_func() into comparecount_wakeup() (879a3763) · Commits · 戴 / test

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 ("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>

arch/mips/kvm/mips.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message