[Intel-gfx] [PATCH v2 3/4] cpuidle: menu: use DIV_ROUND_CLOSEST_ULL()

[Rafael J. Wysocki]

On Tuesday, March 24, 2015 02:03:44 PM Javi Merino wrote:
> Now that the kernel provides DIV_ROUND_CLOSEST_ULL(), drop the internal
> implementation and use the kernel one.
> 
> Cc: "Rafael J. Wysocki" <rafael.j.wysocki at intel.com>
> Cc: Mel Gorman <mgorman at suse.de>
> Cc: Stephen Hemminger <shemminger at linux-foundation.org>
> Signed-off-by: Javi Merino <javi.merino at arm.com>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>

> ---
>  drivers/cpuidle/governors/menu.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
> index 40580794e23d..b8a5fa15ca24 100644
> --- a/drivers/cpuidle/governors/menu.c
> +++ b/drivers/cpuidle/governors/menu.c
> @@ -190,12 +190,6 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);
>  
>  static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev);
>  
> -/* This implements DIV_ROUND_CLOSEST but avoids 64 bit division */
> -static u64 div_round64(u64 dividend, u32 divisor)
> -{
> -	return div_u64(dividend + (divisor / 2), divisor);
> -}
> -
>  /*
>   * Try detecting repeating patterns by keeping track of the last 8
>   * intervals, and checking if the standard deviation of that set
> @@ -317,7 +311,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
>  	 * operands are 32 bits.
>  	 * Make sure to round up for half microseconds.
>  	 */
> -	data->predicted_us = div_round64((uint64_t)data->next_timer_us *
> +	data->predicted_us = DIV_ROUND_CLOSEST_ULL((uint64_t)data->next_timer_us *
>  					 data->correction_factor[data->bucket],
>  					 RESOLUTION * DECAY);
>  
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.