Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b0e1953 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

ktime: Cleanup ktime_set() usage 



ktime_set(S,N) was required for the timespec storage type and is still
useful for situations where a Seconds and Nanoseconds part of a time value
needs to be converted. For anything where the Seconds argument is 0, this
is pointless and can be replaced with a simple assignment.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
parent 2456e855

arch/powerpc/kvm/book3s_hv.c

+1 −2
Original line number Diff line number Diff line
@@ -1872,8 +1872,7 @@ static void kvmppc_set_timer(struct kvm_vcpu *vcpu) 
	}

	dec_nsec = (vcpu->arch.dec_expires - now) * NSEC_PER_SEC

		   / tb_ticks_per_sec;

	hrtimer_start(&vcpu->arch.dec_timer, ktime_set(0, dec_nsec),

		      HRTIMER_MODE_REL);

	hrtimer_start(&vcpu->arch.dec_timer, dec_nsec, HRTIMER_MODE_REL);

	vcpu->arch.timer_running = 1;

}

arch/powerpc/oprofile/cell/spu_profiler.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static enum hrtimer_restart profile_spus(struct hrtimer *timer) 
	smp_wmb();	/* insure spu event buffer updates are written */

			/* don't want events intermingled... */



	kt = ktime_set(0, profiling_interval);

	kt = profiling_interval;

	if (!spu_prof_running)

		goto stop;

	hrtimer_forward(timer, timer->base->get_time(), kt);
@@ -204,7 +204,7 @@ int start_spu_profiling_cycles(unsigned int cycles_reset) 
	ktime_t kt;



	pr_debug("timer resolution: %lu\n", TICK_NSEC);

	kt = ktime_set(0, profiling_interval);

	kt = profiling_interval;

	hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	hrtimer_set_expires(&timer, kt);

	timer.function = profile_spus;

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) 
		return 0;



	__set_cpu_idle(vcpu);

	hrtimer_start(&vcpu->arch.ckc_timer, ktime_set (0, sltime) , HRTIMER_MODE_REL);

	hrtimer_start(&vcpu->arch.ckc_timer, sltime, HRTIMER_MODE_REL);

	VCPU_EVENT(vcpu, 4, "enabled wait: %llu ns", sltime);

no_timer:

	srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);

arch/x86/kvm/lapic.c

+2 −2
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic) 
	now = ktime_get();

	remaining = ktime_sub(apic->lapic_timer.target_expiration, now);

	if (ktime_to_ns(remaining) < 0)

		remaining = ktime_set(0, 0);

		remaining = 0;



	ns = mod_64(ktime_to_ns(remaining), apic->lapic_timer.period);

	tmcct = div64_u64(ns,
@@ -2057,7 +2057,7 @@ void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu) 
			apic->lapic_timer.tscdeadline = 0;

		if (apic_lvtt_oneshot(apic)) {

			apic->lapic_timer.tscdeadline = 0;

			apic->lapic_timer.target_expiration = ktime_set(0, 0);

			apic->lapic_timer.target_expiration = 0;

		}

		atomic_set(&apic->lapic_timer.pending, 0);

	}

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -2569,7 +2569,7 @@ static bool blk_mq_poll_hybrid_sleep(struct request_queue *q, 
	 * This will be replaced with the stats tracking code, using

	 * 'avg_completion_time / 2' as the pre-sleep target.

	 */

	kt = ktime_set(0, nsecs);

	kt = nsecs;



	mode = HRTIMER_MODE_REL;

	hrtimer_init_on_stack(&hs.timer, CLOCK_MONOTONIC, mode);