Skip to content

L
linux
Commit 60a9c3f1 authored by Guenter Roeck's avatar Guenter Roeck
Browse files
Options

hwmon: (sis5595) 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: default avatarGuenter Roeck <linux@roeck-us.net>
parent 24f9ec1f
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 48 deletions
drivers/hwmon/sis5595.c
View file @ 60a9c3f1
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/io.h> #include <linux/io.h>
/* /*
* If force_addr is set to anything different from 0, we forcibly enable * If force_addr is set to anything different from 0, we forcibly enable
* the device at the given address. * the device at the given address.
...@@ -222,7 +221,7 @@ static struct platform_driver sis5595_driver = { ...@@ -222,7 +221,7 @@ static struct platform_driver sis5595_driver = {
}; };
/* 4 Voltages */ /* 4 Voltages */
static ssize_t show_in(struct device *dev, struct device_attribute *da, static ssize_t in_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
...@@ -231,7 +230,7 @@ static ssize_t show_in(struct device *dev, struct device_attribute *da, ...@@ -231,7 +230,7 @@ static ssize_t show_in(struct device *dev, struct device_attribute *da,
return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr])); return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr]));
} }
static ssize_t show_in_min(struct device *dev, struct device_attribute *da, static ssize_t in_min_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
...@@ -240,7 +239,7 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *da, ...@@ -240,7 +239,7 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *da,
return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr])); return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr]));
} }
static ssize_t show_in_max(struct device *dev, struct device_attribute *da, static ssize_t in_max_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
...@@ -249,8 +248,8 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *da, ...@@ -249,8 +248,8 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *da,
return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr])); return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr]));
} }
static ssize_t set_in_min(struct device *dev, struct device_attribute *da, static ssize_t in_min_store(struct device *dev, struct device_attribute *da,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct sis5595_data *data = dev_get_drvdata(dev); struct sis5595_data *data = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
...@@ -269,8 +268,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *da, ...@@ -269,8 +268,8 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *da,
return count; return count;
} }
static ssize_t set_in_max(struct device *dev, struct device_attribute *da, static ssize_t in_max_store(struct device *dev, struct device_attribute *da,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct sis5595_data *data = dev_get_drvdata(dev); struct sis5595_data *data = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
...@@ -289,19 +288,21 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da, ...@@ -289,19 +288,21 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da,
return count; return count;
} }
#define show_in_offset(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_offset(0); static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);
show_in_offset(1); static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);
show_in_offset(2); static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);
show_in_offset(3); static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);
show_in_offset(4); static SENSOR_DEVICE_ATTR_RO(in4_input, in, 4);
static SENSOR_DEVICE_ATTR_RW(in4_min, in_min, 4);
static SENSOR_DEVICE_ATTR_RW(in4_max, in_max, 4);
/* Temperature */ /* Temperature */
static ssize_t temp1_input_show(struct device *dev, static ssize_t temp1_input_show(struct device *dev,
...@@ -368,7 +369,7 @@ static DEVICE_ATTR_RW(temp1_max); ...@@ -368,7 +369,7 @@ static DEVICE_ATTR_RW(temp1_max);
static DEVICE_ATTR_RW(temp1_max_hyst); static DEVICE_ATTR_RW(temp1_max_hyst);
/* 2 Fans */ /* 2 Fans */
static ssize_t show_fan(struct device *dev, struct device_attribute *da, static ssize_t fan_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
...@@ -378,7 +379,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *da, ...@@ -378,7 +379,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *da,
DIV_FROM_REG(data->fan_div[nr]))); DIV_FROM_REG(data->fan_div[nr])));
} }
static ssize_t show_fan_min(struct device *dev, struct device_attribute *da, static ssize_t fan_min_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
...@@ -388,8 +389,8 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *da, ...@@ -388,8 +389,8 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *da,
DIV_FROM_REG(data->fan_div[nr]))); DIV_FROM_REG(data->fan_div[nr])));
} }
static ssize_t set_fan_min(struct device *dev, struct device_attribute *da, static ssize_t fan_min_store(struct device *dev, struct device_attribute *da,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct sis5595_data *data = dev_get_drvdata(dev); struct sis5595_data *data = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
...@@ -408,7 +409,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *da, ...@@ -408,7 +409,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *da,
return count; return count;
} }
static ssize_t show_fan_div(struct device *dev, struct device_attribute *da, static ssize_t fan_div_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
...@@ -423,8 +424,8 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *da, ...@@ -423,8 +424,8 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *da,
* least surprise; the user doesn't expect the fan minimum to change just * least surprise; the user doesn't expect the fan minimum to change just
* because the divisor changed. * because the divisor changed.
*/ */
static ssize_t set_fan_div(struct device *dev, struct device_attribute *da, static ssize_t fan_div_store(struct device *dev, struct device_attribute *da,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct sis5595_data *data = dev_get_drvdata(dev); struct sis5595_data *data = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
...@@ -480,16 +481,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da, ...@@ -480,16 +481,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,
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_RW(fan1_div, fan_div, 0);
static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);
show_fan_min, set_fan_min, offset - 1); \ static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);
static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \ static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);
show_fan_div, set_fan_div, offset - 1);
show_fan_offset(1);
show_fan_offset(2);
/* Alarms */ /* Alarms */
static ssize_t alarms_show(struct device *dev, struct device_attribute *attr, static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,
...@@ -500,21 +497,21 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr, ...@@ -500,21 +497,21 @@ 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 *da, static ssize_t alarm_show(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
int nr = to_sensor_dev_attr(da)->index; int nr = to_sensor_dev_attr(da)->index;
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, 15); static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 15);
static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6); static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);
static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7); static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);
static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 15); static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 15);
static ssize_t name_show(struct device *dev, struct device_attribute *attr, static ssize_t name_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
...@@ -673,7 +670,6 @@ static int sis5595_remove(struct platform_device *pdev) ...@@ -673,7 +670,6 @@ static int sis5595_remove(struct platform_device *pdev)
return 0; return 0;
} }
/* ISA access must be locked explicitly. */ /* ISA access must be locked explicitly. */
static int sis5595_read_value(struct sis5595_data *data, u8 reg) static int sis5595_read_value(struct sis5595_data *data, u8 reg)
{ {
......
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