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

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

hwmon: (lm85) use find_closest() in x_TO_REG() functions 



Replace RANGE_TO_REG() and FREQ_TO_REG() implementations with
calls to find_closest().

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 d38df34e

drivers/hwmon/lm85.c

+8 −18
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/hwmon-sysfs.h>

#include <linux/hwmon-sysfs.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/util_macros.h>





/* Addresses to scan */

/* Addresses to scan */

static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };

static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
@@ -190,15 +191,7 @@ static const int lm85_range_map[] = { 




static int RANGE_TO_REG(long range)

static int RANGE_TO_REG(long range)

{

{

	int i;

	return find_closest(range, lm85_range_map, ARRAY_SIZE(lm85_range_map));



	/* Find the closest match */

	for (i = 0; i < 15; ++i) {

		if (range <= (lm85_range_map[i] + lm85_range_map[i + 1]) / 2)

			break;

	}



	return i;

}

}

#define RANGE_FROM_REG(val)	lm85_range_map[(val) & 0x0f]

#define RANGE_FROM_REG(val)	lm85_range_map[(val) & 0x0f]
@@ -209,16 +202,12 @@ static const int lm85_freq_map[8] = { /* 1 Hz */ 
static const int adm1027_freq_map[8] = { /* 1 Hz */

static const int adm1027_freq_map[8] = { /* 1 Hz */

	11, 15, 22, 29, 35, 44, 59, 88

	11, 15, 22, 29, 35, 44, 59, 88

};

};

#define FREQ_MAP_LEN	8





static int FREQ_TO_REG(const int *map, unsigned long freq)

static int FREQ_TO_REG(const int *map,

		       unsigned int map_size, unsigned long freq)

{

{

	int i;

	return find_closest(freq, map, map_size);



	/* Find the closest match */

	for (i = 0; i < 7; ++i)

		if (freq <= (map[i] + map[i + 1]) / 2)

			break;

	return i;

}

}





static int FREQ_FROM_REG(const int *map, u8 reg)

static int FREQ_FROM_REG(const int *map, u8 reg)
@@ -828,7 +817,8 @@ static ssize_t set_pwm_freq(struct device *dev, 
		data->cfg5 &= ~ADT7468_HFPWM;

		data->cfg5 &= ~ADT7468_HFPWM;

		lm85_write_value(client, ADT7468_REG_CFG5, data->cfg5);

		lm85_write_value(client, ADT7468_REG_CFG5, data->cfg5);

	} else {					/* Low freq. mode */

	} else {					/* Low freq. mode */

		data->pwm_freq[nr] = FREQ_TO_REG(data->freq_map, val);

		data->pwm_freq[nr] = FREQ_TO_REG(data->freq_map,

						 FREQ_MAP_LEN, val);

		lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),

		lm85_write_value(client, LM85_REG_AFAN_RANGE(nr),

				 (data->zone[nr].range << 4)

				 (data->zone[nr].range << 4)

				 | data->pwm_freq[nr]);

				 | data->pwm_freq[nr]);