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

Commit fa72e6af authored by Mariusz Skamra's avatar Mariusz Skamra Committed by Greg Kroah-Hartman
Browse files

usb: Make use of ktime_* comparison functions 



Start using ktime_* compare functions to make the code backportable.
Now that may be a bit tricky due to recent change of ktime_t.

Signed-off-by: default avatarMariusz Skamra <mariuszx.skamra@intel.com>
Acked-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bab35480

drivers/usb/chipidea/otg_fsm.c

+4 −4
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void ci_otg_add_timer(struct ci_hdrc *ci, enum otg_fsm_timer t) 
				ktime_set(timer_sec, timer_nsec));

	ci->enabled_otg_timer_bits |= (1 << t);

	if ((ci->next_otg_timer == NUM_OTG_FSM_TIMERS) ||

			(ci->hr_timeouts[ci->next_otg_timer] >

			ktime_after(ci->hr_timeouts[ci->next_otg_timer],

						ci->hr_timeouts[t])) {

			ci->next_otg_timer = t;

			hrtimer_start_range_ns(&ci->otg_fsm_hrtimer,
@@ -269,7 +269,7 @@ static void ci_otg_del_timer(struct ci_hdrc *ci, enum otg_fsm_timer t) 
			for_each_set_bit(cur_timer, &enabled_timer_bits,

							NUM_OTG_FSM_TIMERS) {

				if ((next_timer == NUM_OTG_FSM_TIMERS) ||

					(ci->hr_timeouts[next_timer] <

					ktime_before(ci->hr_timeouts[next_timer],

					 ci->hr_timeouts[cur_timer]))

					next_timer = cur_timer;

			}
@@ -397,13 +397,13 @@ static enum hrtimer_restart ci_otg_hrtimer_func(struct hrtimer *t) 


	now = ktime_get();

	for_each_set_bit(cur_timer, &enabled_timer_bits, NUM_OTG_FSM_TIMERS) {

		if (now >= ci->hr_timeouts[cur_timer]) {

		if (ktime_compare(now, ci->hr_timeouts[cur_timer]) >= 0) {

			ci->enabled_otg_timer_bits &= ~(1 << cur_timer);

			if (otg_timer_handlers[cur_timer])

				ret = otg_timer_handlers[cur_timer](ci);

		} else {

			if ((next_timer == NUM_OTG_FSM_TIMERS) ||

				(ci->hr_timeouts[cur_timer] <

				ktime_before(ci->hr_timeouts[cur_timer],

					ci->hr_timeouts[next_timer]))

				next_timer = cur_timer;

		}

drivers/usb/host/ehci-timer.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static enum hrtimer_restart ehci_hrtimer_func(struct hrtimer *t) 
	 */

	now = ktime_get();

	for_each_set_bit(e, &events, EHCI_HRTIMER_NUM_EVENTS) {

		if (now >= ehci->hr_timeouts[e])

		if (ktime_compare(now, ehci->hr_timeouts[e]) >= 0)

			event_handlers[e](ehci);

		else

			ehci_enable_event(ehci, e, false);

drivers/usb/host/fotg210-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ static enum hrtimer_restart fotg210_hrtimer_func(struct hrtimer *t) 
	 */

	now = ktime_get();

	for_each_set_bit(e, &events, FOTG210_HRTIMER_NUM_EVENTS) {

		if (now >= fotg210->hr_timeouts[e])

		if (ktime_compare(now, fotg210->hr_timeouts[e]) >= 0)

			event_handlers[e](fotg210);

		else

			fotg210_enable_event(fotg210, e, false);