cpuidle: menu: Use ktime_to_us instead of reinventing the wheel

The ktime_to_us implementation is slightly better than the one implemented
in menu.c. Use it

Signed-off-by: Mel Gorman <[email protected]>
Acked-by: Daniel Lezcano <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index c36e1ea7ef082118fcf4a7f076bffb8b151f6aca..ba6df6044fff958964f6fea78f43f7e57a6f671c 100644 (file)
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -296,7 +296,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
        int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
        int i;
        unsigned int interactivity_req;
-       struct timespec t;
 
        if (data->needs_update) {
                menu_update(drv, dev);
@@ -310,9 +309,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
                return 0;
 
        /* determine the expected residency time, round up */
-       t = ktime_to_timespec(tick_nohz_get_sleep_length());
-       data->next_timer_us =
-               t.tv_sec * USEC_PER_SEC + t.tv_nsec / NSEC_PER_USEC;
+       data->next_timer_us = ktime_to_us(tick_nohz_get_sleep_length());
 
 
        data->bucket = which_bucket(data->next_timer_us);