Skip to content

Commit

Permalink
hwmon: (adt7475) replace find_nearest() with find_closest()
Browse files Browse the repository at this point in the history
The adt7475 has had find_nearest() since it's creation in 2009. Since
then find_closest() has been introduced and several drivers have been
updated to use it. Update the adt7475 to use find_closest() and remove
the now unused find_nearest().

Signed-off-by: Chris Packham <[email protected]>
Signed-off-by: Guenter Roeck <[email protected]>
  • Loading branch information
cpackham-atlnz authored and groeck committed Jun 12, 2017
1 parent 8991ebd commit e465164
Showing 1 changed file with 3 additions and 31 deletions.
34 changes: 3 additions & 31 deletions drivers/hwmon/adt7475.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <linux/hwmon-vid.h>
#include <linux/err.h>
#include <linux/jiffies.h>
#include <linux/util_macros.h>

/* Indexes for the sysfs hooks */

Expand Down Expand Up @@ -314,35 +315,6 @@ static void adt7475_write_word(struct i2c_client *client, int reg, u16 val)
i2c_smbus_write_byte_data(client, reg, val & 0xFF);
}

/*
* Find the nearest value in a table - used for pwm frequency and
* auto temp range
*/
static int find_nearest(long val, const int *array, int size)
{
int i;

if (val < array[0])
return 0;

if (val > array[size - 1])
return size - 1;

for (i = 0; i < size - 1; i++) {
int a, b;

if (val > array[i + 1])
continue;

a = val - array[i];
b = array[i + 1] - val;

return (a <= b) ? i : i + 1;
}

return 0;
}

static ssize_t show_voltage(struct device *dev, struct device_attribute *attr,
char *buf)
{
Expand Down Expand Up @@ -606,7 +578,7 @@ static ssize_t set_point2(struct device *dev, struct device_attribute *attr,
val -= temp;

/* Find the nearest table entry to what the user wrote */
val = find_nearest(val, autorange_table, ARRAY_SIZE(autorange_table));
val = find_closest(val, autorange_table, ARRAY_SIZE(autorange_table));

data->range[sattr->index] &= ~0xF0;
data->range[sattr->index] |= val << 4;
Expand Down Expand Up @@ -864,7 +836,7 @@ static ssize_t set_pwmfreq(struct device *dev, struct device_attribute *attr,
if (kstrtol(buf, 10, &val))
return -EINVAL;

out = find_nearest(val, pwmfreq_table, ARRAY_SIZE(pwmfreq_table));
out = find_closest(val, pwmfreq_table, ARRAY_SIZE(pwmfreq_table));

mutex_lock(&data->lock);

Expand Down

0 comments on commit e465164

Please sign in to comment.