AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

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

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Bartosz Golaszewski 2015-04-16 12:43:34 -07:00 committed by Linus Torvalds
parent f2027543b9
commit d38df34e3f
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/hwmon/ina2xx.c
View File

@ -36,6 +36,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/util_macros.h>
#include <linux/platform_data/ina2xx.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 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) static int ina226_reg_to_interval(u16 config)
{ {
int avg = ina226_avg_tab[INA226_READ_AVG(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, avg = DIV_ROUND_CLOSEST(interval * 1000,
INA226_TOTAL_CONV_TIME_DEFAULT); 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); return (config & ~INA226_AVG_RD_MASK) | INA226_SHIFT_AVG(avg_bits);
} }