openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwmon: (lm85) Use permission specific SENSOR[_DEVICE]_ATTR variants 

Use SENSOR[_DEVICE]_ATTR[_2]_{RO,RW,WO} to simplify the source code,
to improve readbility, and to reduce the chance of inconsistencies.

Also replace any remaining S_<PERMS> in the driver with octal values.

The conversion was done automatically with coccinelle. The semantic patches
and the scripts used to generate this commit log are available at
https://github.com/groeck/coccinelle-patches/.

This patch does not introduce functional changes. It was verified by
compiling the old and new files and comparing text and data sizes.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2019-01-22 10:40:33 -08:00
parent e7655cfd39
commit 7bc85e4921
1 changed files with 174 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

340
drivers/hwmon/lm85.c
View File

@ -165,7 +165,6 @@ static inline u16 FAN_TO_REG(unsigned long val)
#define PWM_TO_REG(val) clamp_val(val, 0, 255) #define PWM_TO_REG(val) clamp_val(val, 0, 255)
#define PWM_FROM_REG(val) (val) #define PWM_FROM_REG(val) (val)
/* /*
* ZONEs have the following parameters: * ZONEs have the following parameters:
* Limit (low) temp, 1. degC * Limit (low) temp, 1. degC
@ -563,24 +562,25 @@ static struct lm85_data *lm85_update_device(struct device *dev)
} }
/* 4 Fans */ /* 4 Fans */
static ssize_t show_fan(struct device *dev, struct device_attribute *attr, static ssize_t fan_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr])); return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr]));
} }
static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr, static ssize_t fan_min_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[nr])); return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[nr]));
} }
static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr, static ssize_t fan_min_store(struct device *dev,
const char *buf, size_t count) struct device_attribute *attr, const char *buf,
size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -599,16 +599,14 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
#define show_fan_offset(offset) \ static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);
static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, \ static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);
show_fan, NULL, offset - 1); \ static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);
static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);
show_fan_min, set_fan_min, offset - 1) static SENSOR_DEVICE_ATTR_RO(fan3_input, fan, 2);
static SENSOR_DEVICE_ATTR_RW(fan3_min, fan_min, 2);
show_fan_offset(1); static SENSOR_DEVICE_ATTR_RO(fan4_input, fan, 3);
show_fan_offset(2); static SENSOR_DEVICE_ATTR_RW(fan4_min, fan_min, 3);
show_fan_offset(3);
show_fan_offset(4);
/* vid, vrm, alarms */ /* vid, vrm, alarms */
@ -667,44 +665,44 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,
static DEVICE_ATTR_RO(alarms); static DEVICE_ATTR_RO(alarms);
static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, static ssize_t alarm_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%u\n", (data->alarms >> nr) & 1); return sprintf(buf, "%u\n", (data->alarms >> nr) & 1);
} }
static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0); static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);
static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1); static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);
static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2); static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);
static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3); static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);
static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8); static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 8);
static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 18); static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 18);
static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 16); static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 16);
static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 17); static SENSOR_DEVICE_ATTR_RO(in7_alarm, alarm, 17);
static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4); static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);
static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_alarm, NULL, 14); static SENSOR_DEVICE_ATTR_RO(temp1_fault, alarm, 14);
static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5); static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 5);
static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 6); static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 6);
static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 15); static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 15);
static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 10); static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 10);
static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 11); static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 11);
static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 12); static SENSOR_DEVICE_ATTR_RO(fan3_alarm, alarm, 12);
static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 13); static SENSOR_DEVICE_ATTR_RO(fan4_alarm, alarm, 13);
/* pwm */ /* pwm */
static ssize_t show_pwm(struct device *dev, struct device_attribute *attr, static ssize_t pwm_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr])); return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr]));
} }
static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, static ssize_t pwm_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -723,8 +721,8 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
static ssize_t show_pwm_enable(struct device *dev, struct device_attribute static ssize_t pwm_enable_show(struct device *dev,
*attr, char *buf) struct device_attribute *attr, char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
@ -745,8 +743,9 @@ static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
return sprintf(buf, "%d\n", enable); return sprintf(buf, "%d\n", enable);
} }
static ssize_t set_pwm_enable(struct device *dev, struct device_attribute static ssize_t pwm_enable_store(struct device *dev,
*attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -788,8 +787,8 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute
return count; return count;
} }
static ssize_t show_pwm_freq(struct device *dev, static ssize_t pwm_freq_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
@ -804,8 +803,9 @@ static ssize_t show_pwm_freq(struct device *dev,
return sprintf(buf, "%d\n", freq); return sprintf(buf, "%d\n", freq);
} }
static ssize_t set_pwm_freq(struct device *dev, static ssize_t pwm_freq_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr, const char *buf,
size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -841,22 +841,20 @@ static ssize_t set_pwm_freq(struct device *dev,
return count; return count;
} }
#define show_pwm_reg(offset) \ static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);
static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RW(pwm1_enable, pwm_enable, 0);
show_pwm, set_pwm, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(pwm1_freq, pwm_freq, 0);
static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);
show_pwm_enable, set_pwm_enable, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(pwm2_enable, pwm_enable, 1);
static SENSOR_DEVICE_ATTR(pwm##offset##_freq, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RW(pwm2_freq, pwm_freq, 1);
show_pwm_freq, set_pwm_freq, offset - 1) static SENSOR_DEVICE_ATTR_RW(pwm3, pwm, 2);
static SENSOR_DEVICE_ATTR_RW(pwm3_enable, pwm_enable, 2);
show_pwm_reg(1); static SENSOR_DEVICE_ATTR_RW(pwm3_freq, pwm_freq, 2);
show_pwm_reg(2);
show_pwm_reg(3);
/* Voltages */ /* Voltages */
static ssize_t show_in(struct device *dev, struct device_attribute *attr, static ssize_t in_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
@ -864,16 +862,16 @@ static ssize_t show_in(struct device *dev, struct device_attribute *attr,
data->in_ext[nr])); data->in_ext[nr]));
} }
static ssize_t show_in_min(struct device *dev, struct device_attribute *attr, static ssize_t in_min_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", INS_FROM_REG(nr, data->in_min[nr])); return sprintf(buf, "%d\n", INS_FROM_REG(nr, data->in_min[nr]));
} }
static ssize_t set_in_min(struct device *dev, struct device_attribute *attr, static ssize_t in_min_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -892,16 +890,16 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
static ssize_t show_in_max(struct device *dev, struct device_attribute *attr, static ssize_t in_max_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", INS_FROM_REG(nr, data->in_max[nr])); return sprintf(buf, "%d\n", INS_FROM_REG(nr, data->in_max[nr]));
} }
static ssize_t set_in_max(struct device *dev, struct device_attribute *attr, static ssize_t in_max_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -920,27 +918,35 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
#define show_in_reg(offset) \ static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);
static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, \ static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);
show_in, NULL, offset); \ static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);
static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);
show_in_min, set_in_min, offset); \ static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);
static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);
show_in_max, set_in_max, offset) static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);
static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);
show_in_reg(0); static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);
show_in_reg(1); static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);
show_in_reg(2); static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);
show_in_reg(3); static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);
show_in_reg(4); static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);
show_in_reg(5); static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);
show_in_reg(6); static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);
show_in_reg(7); static SENSOR_DEVICE_ATTR_RO(in5_input, in, 5);
static SENSOR_DEVICE_ATTR_RW(in5_min, in_min, 5);
static SENSOR_DEVICE_ATTR_RW(in5_max, in_max, 5);
static SENSOR_DEVICE_ATTR_RO(in6_input, in, 6);
static SENSOR_DEVICE_ATTR_RW(in6_min, in_min, 6);
static SENSOR_DEVICE_ATTR_RW(in6_max, in_max, 6);
static SENSOR_DEVICE_ATTR_RO(in7_input, in, 7);
static SENSOR_DEVICE_ATTR_RW(in7_min, in_min, 7);
static SENSOR_DEVICE_ATTR_RW(in7_max, in_max, 7);
/* Temps */ /* Temps */
static ssize_t show_temp(struct device *dev, struct device_attribute *attr, static ssize_t temp_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
@ -948,16 +954,17 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
data->temp_ext[nr])); data->temp_ext[nr]));
} }
static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr, static ssize_t temp_min_show(struct device *dev,
char *buf) struct device_attribute *attr, char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[nr]));
} }
static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, static ssize_t temp_min_store(struct device *dev,
const char *buf, size_t count) struct device_attribute *attr, const char *buf,
size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -979,16 +986,17 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr, static ssize_t temp_max_show(struct device *dev,
char *buf) struct device_attribute *attr, char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[nr])); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[nr]));
} }
static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, static ssize_t temp_max_store(struct device *dev,
const char *buf, size_t count) struct device_attribute *attr, const char *buf,
size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1010,31 +1018,30 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
#define show_temp_reg(offset) \ static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);
static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \ static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);
show_temp, NULL, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);
static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);
show_temp_min, set_temp_min, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);
static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);
show_temp_max, set_temp_max, offset - 1); static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);
static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_min, 2);
show_temp_reg(1); static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);
show_temp_reg(2);
show_temp_reg(3);
/* Automatic PWM control */ /* Automatic PWM control */
static ssize_t show_pwm_auto_channels(struct device *dev, static ssize_t pwm_auto_channels_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", ZONE_FROM_REG(data->autofan[nr].config)); return sprintf(buf, "%d\n", ZONE_FROM_REG(data->autofan[nr].config));
} }
static ssize_t set_pwm_auto_channels(struct device *dev, static ssize_t pwm_auto_channels_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1055,16 +1062,17 @@ static ssize_t set_pwm_auto_channels(struct device *dev,
return count; return count;
} }
static ssize_t show_pwm_auto_pwm_min(struct device *dev, static ssize_t pwm_auto_pwm_min_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", PWM_FROM_REG(data->autofan[nr].min_pwm)); return sprintf(buf, "%d\n", PWM_FROM_REG(data->autofan[nr].min_pwm));
} }
static ssize_t set_pwm_auto_pwm_min(struct device *dev, static ssize_t pwm_auto_pwm_min_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1084,16 +1092,18 @@ static ssize_t set_pwm_auto_pwm_min(struct device *dev,
return count; return count;
} }
static ssize_t show_pwm_auto_pwm_minctl(struct device *dev, static ssize_t pwm_auto_pwm_minctl_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", data->autofan[nr].min_off); return sprintf(buf, "%d\n", data->autofan[nr].min_off);
} }
static ssize_t set_pwm_auto_pwm_minctl(struct device *dev, static ssize_t pwm_auto_pwm_minctl_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1117,25 +1127,21 @@ static ssize_t set_pwm_auto_pwm_minctl(struct device *dev,
return count; return count;
} }
#define pwm_auto(offset) \ static SENSOR_DEVICE_ATTR_RW(pwm1_auto_channels, pwm_auto_channels, 0);
static SENSOR_DEVICE_ATTR(pwm##offset##_auto_channels, \ static SENSOR_DEVICE_ATTR_RW(pwm1_auto_pwm_min, pwm_auto_pwm_min, 0);
S_IRUGO | S_IWUSR, show_pwm_auto_channels, \ static SENSOR_DEVICE_ATTR_RW(pwm1_auto_pwm_minctl, pwm_auto_pwm_minctl, 0);
set_pwm_auto_channels, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(pwm2_auto_channels, pwm_auto_channels, 1);
static SENSOR_DEVICE_ATTR(pwm##offset##_auto_pwm_min, \ static SENSOR_DEVICE_ATTR_RW(pwm2_auto_pwm_min, pwm_auto_pwm_min, 1);
S_IRUGO | S_IWUSR, show_pwm_auto_pwm_min, \ static SENSOR_DEVICE_ATTR_RW(pwm2_auto_pwm_minctl, pwm_auto_pwm_minctl, 1);
set_pwm_auto_pwm_min, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(pwm3_auto_channels, pwm_auto_channels, 2);
static SENSOR_DEVICE_ATTR(pwm##offset##_auto_pwm_minctl, \ static SENSOR_DEVICE_ATTR_RW(pwm3_auto_pwm_min, pwm_auto_pwm_min, 2);
S_IRUGO | S_IWUSR, show_pwm_auto_pwm_minctl, \ static SENSOR_DEVICE_ATTR_RW(pwm3_auto_pwm_minctl, pwm_auto_pwm_minctl, 2);
set_pwm_auto_pwm_minctl, offset - 1)
pwm_auto(1);
pwm_auto(2);
pwm_auto(3);
/* Temperature settings for automatic PWM control */ /* Temperature settings for automatic PWM control */
static ssize_t show_temp_auto_temp_off(struct device *dev, static ssize_t temp_auto_temp_off_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
@ -1143,8 +1149,9 @@ static ssize_t show_temp_auto_temp_off(struct device *dev,
HYST_FROM_REG(data->zone[nr].hyst)); HYST_FROM_REG(data->zone[nr].hyst));
} }
static ssize_t set_temp_auto_temp_off(struct device *dev, static ssize_t temp_auto_temp_off_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1172,16 +1179,18 @@ static ssize_t set_temp_auto_temp_off(struct device *dev,
return count; return count;
} }
static ssize_t show_temp_auto_temp_min(struct device *dev, static ssize_t temp_auto_temp_min_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->zone[nr].limit)); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->zone[nr].limit));
} }
static ssize_t set_temp_auto_temp_min(struct device *dev, static ssize_t temp_auto_temp_min_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1210,8 +1219,9 @@ static ssize_t set_temp_auto_temp_min(struct device *dev,
return count; return count;
} }
static ssize_t show_temp_auto_temp_max(struct device *dev, static ssize_t temp_auto_temp_max_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
@ -1219,8 +1229,9 @@ static ssize_t show_temp_auto_temp_max(struct device *dev,
RANGE_FROM_REG(data->zone[nr].range)); RANGE_FROM_REG(data->zone[nr].range));
} }
static ssize_t set_temp_auto_temp_max(struct device *dev, static ssize_t temp_auto_temp_max_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1245,16 +1256,18 @@ static ssize_t set_temp_auto_temp_max(struct device *dev,
return count; return count;
} }
static ssize_t show_temp_auto_temp_crit(struct device *dev, static ssize_t temp_auto_temp_crit_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->zone[nr].critical)); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->zone[nr].critical));
} }
static ssize_t set_temp_auto_temp_crit(struct device *dev, static ssize_t temp_auto_temp_crit_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
int nr = to_sensor_dev_attr(attr)->index; int nr = to_sensor_dev_attr(attr)->index;
struct lm85_data *data = dev_get_drvdata(dev); struct lm85_data *data = dev_get_drvdata(dev);
@ -1274,23 +1287,18 @@ static ssize_t set_temp_auto_temp_crit(struct device *dev,
return count; return count;
} }
#define temp_auto(offset) \ static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_off, temp_auto_temp_off, 0);
static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_off, \ static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_min, temp_auto_temp_min, 0);
S_IRUGO | S_IWUSR, show_temp_auto_temp_off, \ static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_max, temp_auto_temp_max, 0);
set_temp_auto_temp_off, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(temp1_auto_temp_crit, temp_auto_temp_crit, 0);
static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_min, \ static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_off, temp_auto_temp_off, 1);
S_IRUGO | S_IWUSR, show_temp_auto_temp_min, \ static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_min, temp_auto_temp_min, 1);
set_temp_auto_temp_min, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_max, temp_auto_temp_max, 1);
static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_max, \ static SENSOR_DEVICE_ATTR_RW(temp2_auto_temp_crit, temp_auto_temp_crit, 1);
S_IRUGO | S_IWUSR, show_temp_auto_temp_max, \ static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_off, temp_auto_temp_off, 2);
set_temp_auto_temp_max, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_min, temp_auto_temp_min, 2);
static SENSOR_DEVICE_ATTR(temp##offset##_auto_temp_crit, \ static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_max, temp_auto_temp_max, 2);
S_IRUGO | S_IWUSR, show_temp_auto_temp_crit, \ static SENSOR_DEVICE_ATTR_RW(temp3_auto_temp_crit, temp_auto_temp_crit, 2);
set_temp_auto_temp_crit, offset - 1);
temp_auto(1);
temp_auto(2);
temp_auto(3);
static struct attribute *lm85_attributes[] = { static struct attribute *lm85_attributes[] = {
&sensor_dev_attr_fan1_input.dev_attr.attr, &sensor_dev_attr_fan1_input.dev_attr.attr,