On Fri, May 26, 2017 at 12:15:59PM +0200, Mariusz Skamra wrote:
> 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: Mariusz Skamra <mariuszx.skamra@xxxxxxxxx>
> Acked-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxx>
> ---
> drivers/usb/chipidea/otg_fsm.c | 8 ++++----
> drivers/usb/host/ehci-timer.c | 2 +-
> drivers/usb/host/fotg210-hcd.c | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
> index 93e24ce..949183e 100644
> --- a/drivers/usb/chipidea/otg_fsm.c
> +++ b/drivers/usb/chipidea/otg_fsm.c
> @@ -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;
> }
For chipidea part:
Acked-by: Peter Chen <peter.chen@xxxxxxx>
--
Best Regards,
Peter Chen
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
