Skip to content

L
linux
Commit 0a0ab22a authored by Guenter Roeck's avatar Guenter Roeck
Browse files
Options

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

Use SENSOR[_DEVICE]_ATTR[_2]_{RO,RW,WO} to simplify the source code,
to improve readability, 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/hwmon/.

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: default avatarGuenter Roeck <linux@roeck-us.net>
parent dc8dbb4d
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 49 deletions
drivers/hwmon/max6639.c
View file @ 0a0ab22a
...@@ -162,7 +162,7 @@ static struct max6639_data *max6639_update_device(struct device *dev) ...@@ -162,7 +162,7 @@ static struct max6639_data *max6639_update_device(struct device *dev)
return ret; return ret;
} }
static ssize_t show_temp_input(struct device *dev, static ssize_t temp_input_show(struct device *dev,
struct device_attribute *dev_attr, char *buf) struct device_attribute *dev_attr, char *buf)
{ {
long temp; long temp;
...@@ -176,7 +176,7 @@ static ssize_t show_temp_input(struct device *dev, ...@@ -176,7 +176,7 @@ static ssize_t show_temp_input(struct device *dev,
return sprintf(buf, "%ld\n", temp); return sprintf(buf, "%ld\n", temp);
} }
static ssize_t show_temp_fault(struct device *dev, static ssize_t temp_fault_show(struct device *dev,
struct device_attribute *dev_attr, char *buf) struct device_attribute *dev_attr, char *buf)
{ {
struct max6639_data *data = max6639_update_device(dev); struct max6639_data *data = max6639_update_device(dev);
...@@ -188,7 +188,7 @@ static ssize_t show_temp_fault(struct device *dev, ...@@ -188,7 +188,7 @@ static ssize_t show_temp_fault(struct device *dev,
return sprintf(buf, "%d\n", data->temp_fault[attr->index]); return sprintf(buf, "%d\n", data->temp_fault[attr->index]);
} }
static ssize_t show_temp_max(struct device *dev, static ssize_t temp_max_show(struct device *dev,
struct device_attribute *dev_attr, char *buf) struct device_attribute *dev_attr, char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr); struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr);
...@@ -197,7 +197,7 @@ static ssize_t show_temp_max(struct device *dev, ...@@ -197,7 +197,7 @@ static ssize_t show_temp_max(struct device *dev,
return sprintf(buf, "%d\n", (data->temp_therm[attr->index] * 1000)); return sprintf(buf, "%d\n", (data->temp_therm[attr->index] * 1000));
} }
static ssize_t set_temp_max(struct device *dev, static ssize_t temp_max_store(struct device *dev,
struct device_attribute *dev_attr, struct device_attribute *dev_attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
...@@ -220,7 +220,7 @@ static ssize_t set_temp_max(struct device *dev, ...@@ -220,7 +220,7 @@ static ssize_t set_temp_max(struct device *dev,
return count; return count;
} }
static ssize_t show_temp_crit(struct device *dev, static ssize_t temp_crit_show(struct device *dev,
struct device_attribute *dev_attr, char *buf) struct device_attribute *dev_attr, char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr); struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr);
...@@ -229,7 +229,7 @@ static ssize_t show_temp_crit(struct device *dev, ...@@ -229,7 +229,7 @@ static ssize_t show_temp_crit(struct device *dev,
return sprintf(buf, "%d\n", (data->temp_alert[attr->index] * 1000)); return sprintf(buf, "%d\n", (data->temp_alert[attr->index] * 1000));
} }
static ssize_t set_temp_crit(struct device *dev, static ssize_t temp_crit_store(struct device *dev,
struct device_attribute *dev_attr, struct device_attribute *dev_attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
...@@ -252,7 +252,7 @@ static ssize_t set_temp_crit(struct device *dev, ...@@ -252,7 +252,7 @@ static ssize_t set_temp_crit(struct device *dev,
return count; return count;
} }
static ssize_t show_temp_emergency(struct device *dev, static ssize_t temp_emergency_show(struct device *dev,
struct device_attribute *dev_attr, struct device_attribute *dev_attr,
char *buf) char *buf)
{ {
...@@ -262,7 +262,7 @@ static ssize_t show_temp_emergency(struct device *dev, ...@@ -262,7 +262,7 @@ static ssize_t show_temp_emergency(struct device *dev,
return sprintf(buf, "%d\n", (data->temp_ot[attr->index] * 1000)); return sprintf(buf, "%d\n", (data->temp_ot[attr->index] * 1000));
} }
static ssize_t set_temp_emergency(struct device *dev, static ssize_t temp_emergency_store(struct device *dev,
struct device_attribute *dev_attr, struct device_attribute *dev_attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
...@@ -285,8 +285,8 @@ static ssize_t set_temp_emergency(struct device *dev, ...@@ -285,8 +285,8 @@ static ssize_t set_temp_emergency(struct device *dev,
return count; return count;
} }
static ssize_t show_pwm(struct device *dev, static ssize_t pwm_show(struct device *dev, struct device_attribute *dev_attr,
struct device_attribute *dev_attr, char *buf) char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr); struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr);
struct max6639_data *data = dev_get_drvdata(dev); struct max6639_data *data = dev_get_drvdata(dev);
...@@ -294,9 +294,9 @@ static ssize_t show_pwm(struct device *dev, ...@@ -294,9 +294,9 @@ static ssize_t show_pwm(struct device *dev,
return sprintf(buf, "%d\n", data->pwm[attr->index] * 255 / 120); return sprintf(buf, "%d\n", data->pwm[attr->index] * 255 / 120);
} }
static ssize_t set_pwm(struct device *dev, static ssize_t pwm_store(struct device *dev,
struct device_attribute *dev_attr, struct device_attribute *dev_attr, const char *buf,
const char *buf, size_t count) size_t count)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr); struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr);
struct max6639_data *data = dev_get_drvdata(dev); struct max6639_data *data = dev_get_drvdata(dev);
...@@ -319,7 +319,7 @@ static ssize_t set_pwm(struct device *dev, ...@@ -319,7 +319,7 @@ static ssize_t set_pwm(struct device *dev,
return count; return count;
} }
static ssize_t show_fan_input(struct device *dev, static ssize_t fan_input_show(struct device *dev,
struct device_attribute *dev_attr, char *buf) struct device_attribute *dev_attr, char *buf)
{ {
struct max6639_data *data = max6639_update_device(dev); struct max6639_data *data = max6639_update_device(dev);
...@@ -332,7 +332,7 @@ static ssize_t show_fan_input(struct device *dev, ...@@ -332,7 +332,7 @@ static ssize_t show_fan_input(struct device *dev,
data->rpm_range)); data->rpm_range));
} }
static ssize_t show_alarm(struct device *dev, static ssize_t alarm_show(struct device *dev,
struct device_attribute *dev_attr, char *buf) struct device_attribute *dev_attr, char *buf)
{ {
struct max6639_data *data = max6639_update_device(dev); struct max6639_data *data = max6639_update_device(dev);
...@@ -344,34 +344,28 @@ static ssize_t show_alarm(struct device *dev, ...@@ -344,34 +344,28 @@ static ssize_t show_alarm(struct device *dev,
return sprintf(buf, "%d\n", !!(data->status & (1 << attr->index))); return sprintf(buf, "%d\n", !!(data->status & (1 << attr->index)));
} }
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input, NULL, 0); static SENSOR_DEVICE_ATTR_RO(temp1_input, temp_input, 0);
static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input, NULL, 1); static SENSOR_DEVICE_ATTR_RO(temp2_input, temp_input, 1);
static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0); static SENSOR_DEVICE_ATTR_RO(temp1_fault, temp_fault, 0);
static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_temp_fault, NULL, 1); static SENSOR_DEVICE_ATTR_RO(temp2_fault, temp_fault, 1);
static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max, static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);
set_temp_max, 0); static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);
static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_max, static SENSOR_DEVICE_ATTR_RW(temp1_crit, temp_crit, 0);
set_temp_max, 1); static SENSOR_DEVICE_ATTR_RW(temp2_crit, temp_crit, 1);
static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp_crit, static SENSOR_DEVICE_ATTR_RW(temp1_emergency, temp_emergency, 0);
set_temp_crit, 0); static SENSOR_DEVICE_ATTR_RW(temp2_emergency, temp_emergency, 1);
static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp_crit, static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);
set_temp_crit, 1); static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);
static SENSOR_DEVICE_ATTR(temp1_emergency, S_IWUSR | S_IRUGO, static SENSOR_DEVICE_ATTR_RO(fan1_input, fan_input, 0);
show_temp_emergency, set_temp_emergency, 0); static SENSOR_DEVICE_ATTR_RO(fan2_input, fan_input, 1);
static SENSOR_DEVICE_ATTR(temp2_emergency, S_IWUSR | S_IRUGO, static SENSOR_DEVICE_ATTR_RO(fan1_fault, alarm, 1);
show_temp_emergency, set_temp_emergency, 1); static SENSOR_DEVICE_ATTR_RO(fan2_fault, alarm, 0);
static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 0); static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 3);
static SENSOR_DEVICE_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 1); static SENSOR_DEVICE_ATTR_RO(temp2_max_alarm, alarm, 2);
static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan_input, NULL, 0); static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 7);
static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan_input, NULL, 1); static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 6);
static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, show_alarm, NULL, 1); static SENSOR_DEVICE_ATTR_RO(temp1_emergency_alarm, alarm, 5);
static SENSOR_DEVICE_ATTR(fan2_fault, S_IRUGO, show_alarm, NULL, 0); static SENSOR_DEVICE_ATTR_RO(temp2_emergency_alarm, alarm, 4);
static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 3);
static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 2);
static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 7);
static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 6);
static SENSOR_DEVICE_ATTR(temp1_emergency_alarm, S_IRUGO, show_alarm, NULL, 5);
static SENSOR_DEVICE_ATTR(temp2_emergency_alarm, S_IRUGO, show_alarm, NULL, 4);
static struct attribute *max6639_attrs[] = { static struct attribute *max6639_attrs[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7