hwmon: (gl518sm) 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: Guenter Roeck <linux@roeck-us.net>
hifive-unleashed-5.1
Guenter Roeck
parent
35ca16c84e
commit
8f3bcb360a
|
|
@ -264,7 +264,7 @@ show(RAW, alarms, alarms);
|
|||
show(BOOL, beep_enable, beep_enable);
|
||||
show(BEEP_MASK, beep_mask, beep_mask);
|
||||
|
||||
static ssize_t show_fan_input(struct device *dev,
|
||||
static ssize_t fan_input_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
int nr = to_sensor_dev_attr(attr)->index;
|
||||
|
|
@ -273,8 +273,8 @@ static ssize_t show_fan_input(struct device *dev,
|
|||
DIV_FROM_REG(data->fan_div[nr])));
|
||||
}
|
||||
|
||||
static ssize_t show_fan_min(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
static ssize_t fan_min_show(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
int nr = to_sensor_dev_attr(attr)->index;
|
||||
struct gl518_data *data = gl518_update_device(dev);
|
||||
|
|
@ -282,8 +282,8 @@ static ssize_t show_fan_min(struct device *dev,
|
|||
DIV_FROM_REG(data->fan_div[nr])));
|
||||
}
|
||||
|
||||
static ssize_t show_fan_div(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
static ssize_t fan_div_show(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
int nr = to_sensor_dev_attr(attr)->index;
|
||||
struct gl518_data *data = gl518_update_device(dev);
|
||||
|
|
@ -350,8 +350,9 @@ set_high(IN, in_max3, voltage_max[3], GL518_REG_VIN3_LIMIT);
|
|||
set_bits(BOOL, beep_enable, beep_enable, GL518_REG_CONF, 0x04, 2);
|
||||
set(BEEP_MASK, beep_mask, beep_mask, GL518_REG_ALARM);
|
||||
|
||||
static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
static ssize_t fan_min_store(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct gl518_data *data = dev_get_drvdata(dev);
|
||||
struct i2c_client *client = data->client;
|
||||
|
|
@ -383,8 +384,9 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
|
|||
return count;
|
||||
}
|
||||
|
||||
static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
static ssize_t fan_div_store(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct gl518_data *data = dev_get_drvdata(dev);
|
||||
struct i2c_client *client = data->client;
|
||||
|
|
@ -427,40 +429,36 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
|
|||
return count;
|
||||
}
|
||||
|
||||
static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);
|
||||
static DEVICE_ATTR(temp1_max, S_IWUSR|S_IRUGO, show_temp_max1, set_temp_max1);
|
||||
static DEVICE_ATTR(temp1_max_hyst, S_IWUSR|S_IRUGO,
|
||||
show_temp_hyst1, set_temp_hyst1);
|
||||
static DEVICE_ATTR(fan1_auto, S_IWUSR|S_IRUGO, show_fan_auto1, set_fan_auto1);
|
||||
static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan_input, NULL, 0);
|
||||
static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan_input, NULL, 1);
|
||||
static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR|S_IRUGO,
|
||||
show_fan_min, set_fan_min, 0);
|
||||
static SENSOR_DEVICE_ATTR(fan2_min, S_IWUSR|S_IRUGO,
|
||||
show_fan_min, set_fan_min, 1);
|
||||
static SENSOR_DEVICE_ATTR(fan1_div, S_IWUSR|S_IRUGO,
|
||||
show_fan_div, set_fan_div, 0);
|
||||
static SENSOR_DEVICE_ATTR(fan2_div, S_IWUSR|S_IRUGO,
|
||||
show_fan_div, set_fan_div, 1);
|
||||
static DEVICE_ATTR(in0_input, S_IRUGO, show_in_input0, NULL);
|
||||
static DEVICE_ATTR(in1_input, S_IRUGO, show_in_input1, NULL);
|
||||
static DEVICE_ATTR(in2_input, S_IRUGO, show_in_input2, NULL);
|
||||
static DEVICE_ATTR(in3_input, S_IRUGO, show_in_input3, NULL);
|
||||
static DEVICE_ATTR(in0_min, S_IWUSR|S_IRUGO, show_in_min0, set_in_min0);
|
||||
static DEVICE_ATTR(in1_min, S_IWUSR|S_IRUGO, show_in_min1, set_in_min1);
|
||||
static DEVICE_ATTR(in2_min, S_IWUSR|S_IRUGO, show_in_min2, set_in_min2);
|
||||
static DEVICE_ATTR(in3_min, S_IWUSR|S_IRUGO, show_in_min3, set_in_min3);
|
||||
static DEVICE_ATTR(in0_max, S_IWUSR|S_IRUGO, show_in_max0, set_in_max0);
|
||||
static DEVICE_ATTR(in1_max, S_IWUSR|S_IRUGO, show_in_max1, set_in_max1);
|
||||
static DEVICE_ATTR(in2_max, S_IWUSR|S_IRUGO, show_in_max2, set_in_max2);
|
||||
static DEVICE_ATTR(in3_max, S_IWUSR|S_IRUGO, show_in_max3, set_in_max3);
|
||||
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
|
||||
static DEVICE_ATTR(beep_enable, S_IWUSR|S_IRUGO,
|
||||
show_beep_enable, set_beep_enable);
|
||||
static DEVICE_ATTR(beep_mask, S_IWUSR|S_IRUGO,
|
||||
show_beep_mask, set_beep_mask);
|
||||
static DEVICE_ATTR(temp1_input, 0444, show_temp_input1, NULL);
|
||||
static DEVICE_ATTR(temp1_max, 0644, show_temp_max1, set_temp_max1);
|
||||
static DEVICE_ATTR(temp1_max_hyst, 0644,
|
||||
show_temp_hyst1, set_temp_hyst1);
|
||||
static DEVICE_ATTR(fan1_auto, 0644, show_fan_auto1, set_fan_auto1);
|
||||
static SENSOR_DEVICE_ATTR_RO(fan1_input, fan_input, 0);
|
||||
static SENSOR_DEVICE_ATTR_RO(fan2_input, fan_input, 1);
|
||||
static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);
|
||||
static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);
|
||||
static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);
|
||||
static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);
|
||||
static DEVICE_ATTR(in0_input, 0444, show_in_input0, NULL);
|
||||
static DEVICE_ATTR(in1_input, 0444, show_in_input1, NULL);
|
||||
static DEVICE_ATTR(in2_input, 0444, show_in_input2, NULL);
|
||||
static DEVICE_ATTR(in3_input, 0444, show_in_input3, NULL);
|
||||
static DEVICE_ATTR(in0_min, 0644, show_in_min0, set_in_min0);
|
||||
static DEVICE_ATTR(in1_min, 0644, show_in_min1, set_in_min1);
|
||||
static DEVICE_ATTR(in2_min, 0644, show_in_min2, set_in_min2);
|
||||
static DEVICE_ATTR(in3_min, 0644, show_in_min3, set_in_min3);
|
||||
static DEVICE_ATTR(in0_max, 0644, show_in_max0, set_in_max0);
|
||||
static DEVICE_ATTR(in1_max, 0644, show_in_max1, set_in_max1);
|
||||
static DEVICE_ATTR(in2_max, 0644, show_in_max2, set_in_max2);
|
||||
static DEVICE_ATTR(in3_max, 0644, show_in_max3, set_in_max3);
|
||||
static DEVICE_ATTR(alarms, 0444, show_alarms, NULL);
|
||||
static DEVICE_ATTR(beep_enable, 0644,
|
||||
show_beep_enable, set_beep_enable);
|
||||
static DEVICE_ATTR(beep_mask, 0644,
|
||||
show_beep_mask, set_beep_mask);
|
||||
|
||||
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)
|
||||
{
|
||||
int bitnr = to_sensor_dev_attr(attr)->index;
|
||||
|
|
@ -468,24 +466,24 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
|
|||
return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
|
||||
}
|
||||
|
||||
static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);
|
||||
static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);
|
||||
static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);
|
||||
static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);
|
||||
static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);
|
||||
static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 5);
|
||||
static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 6);
|
||||
static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0);
|
||||
static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 1);
|
||||
static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 2);
|
||||
static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 3);
|
||||
static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);
|
||||
static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 5);
|
||||
static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 6);
|
||||
|
||||
static ssize_t show_beep(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
static ssize_t beep_show(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
int bitnr = to_sensor_dev_attr(attr)->index;
|
||||
struct gl518_data *data = gl518_update_device(dev);
|
||||
return sprintf(buf, "%u\n", (data->beep_mask >> bitnr) & 1);
|
||||
}
|
||||
|
||||
static ssize_t set_beep(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
static ssize_t beep_store(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct gl518_data *data = dev_get_drvdata(dev);
|
||||
struct i2c_client *client = data->client;
|
||||
|
|
@ -511,13 +509,13 @@ static ssize_t set_beep(struct device *dev, struct device_attribute *attr,
|
|||
return count;
|
||||
}
|
||||
|
||||
static SENSOR_DEVICE_ATTR(in0_beep, S_IRUGO|S_IWUSR, show_beep, set_beep, 0);
|
||||
static SENSOR_DEVICE_ATTR(in1_beep, S_IRUGO|S_IWUSR, show_beep, set_beep, 1);
|
||||
static SENSOR_DEVICE_ATTR(in2_beep, S_IRUGO|S_IWUSR, show_beep, set_beep, 2);
|
||||
static SENSOR_DEVICE_ATTR(in3_beep, S_IRUGO|S_IWUSR, show_beep, set_beep, 3);
|
||||
static SENSOR_DEVICE_ATTR(temp1_beep, S_IRUGO|S_IWUSR, show_beep, set_beep, 4);
|
||||
static SENSOR_DEVICE_ATTR(fan1_beep, S_IRUGO|S_IWUSR, show_beep, set_beep, 5);
|
||||
static SENSOR_DEVICE_ATTR(fan2_beep, S_IRUGO|S_IWUSR, show_beep, set_beep, 6);
|
||||
static SENSOR_DEVICE_ATTR_RW(in0_beep, beep, 0);
|
||||
static SENSOR_DEVICE_ATTR_RW(in1_beep, beep, 1);
|
||||
static SENSOR_DEVICE_ATTR_RW(in2_beep, beep, 2);
|
||||
static SENSOR_DEVICE_ATTR_RW(in3_beep, beep, 3);
|
||||
static SENSOR_DEVICE_ATTR_RW(temp1_beep, beep, 4);
|
||||
static SENSOR_DEVICE_ATTR_RW(fan1_beep, beep, 5);
|
||||
static SENSOR_DEVICE_ATTR_RW(fan2_beep, beep, 6);
|
||||
|
||||
static struct attribute *gl518_attributes[] = {
|
||||
&dev_attr_in3_input.attr,
|
||||
|
|
|
|||
Loading…
Reference in New Issue