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

Commit d38df34e authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Linus Torvalds
Browse files

hwmon: (ina2xx) replace ina226_avg_bits() with find_closest() 



Use find_closest() to locate the closest average in ina226_avg_tab.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2027543

drivers/hwmon/ina2xx.c

+3 −14
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/jiffies.h>

#include <linux/of.h>

#include <linux/delay.h>

#include <linux/util_macros.h>



#include <linux/platform_data/ina2xx.h>
@@ -141,19 +142,6 @@ static const struct ina2xx_config ina2xx_config[] = { 
 */

static const int ina226_avg_tab[] = { 1, 4, 16, 64, 128, 256, 512, 1024 };



static int ina226_avg_bits(int avg)

{

	int i;



	/* Get the closest average from the tab. */

	for (i = 0; i < ARRAY_SIZE(ina226_avg_tab) - 1; i++) {

		if (avg <= (ina226_avg_tab[i] + ina226_avg_tab[i + 1]) / 2)

			break;

	}



	return i; /* Return 0b0111 for values greater than 1024. */

}



static int ina226_reg_to_interval(u16 config)

{

	int avg = ina226_avg_tab[INA226_READ_AVG(config)];
@@ -171,7 +159,8 @@ static u16 ina226_interval_to_reg(int interval, u16 config) 


	avg = DIV_ROUND_CLOSEST(interval * 1000,

				INA226_TOTAL_CONV_TIME_DEFAULT);

	avg_bits = ina226_avg_bits(avg);

	avg_bits = find_closest(avg, ina226_avg_tab,

				ARRAY_SIZE(ina226_avg_tab));



	return (config & ~INA226_AVG_RD_MASK) | INA226_SHIFT_AVG(avg_bits);

}