Commit 9d5bc090 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (via686a) 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 7bc85e49

drivers/hwmon/via686a.c

+73 −75
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <linux/acpi.h>

#include <linux/io.h>





/*

 * If force_addr is set to anything different from 0, we forcibly enable

 * the device at the given address.
@@ -355,7 +354,7 @@ static void via686a_init_device(struct via686a_data *data); 
/* following are the sysfs callback functions */



/* 7 voltage sensors */

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) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -363,7 +362,7 @@ static ssize_t show_in(struct device *dev, struct device_attribute *da, 
	return sprintf(buf, "%ld\n", IN_FROM_REG(data->in[nr], 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) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -371,7 +370,7 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *da, 
	return sprintf(buf, "%ld\n", IN_FROM_REG(data->in_min[nr], 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) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -379,7 +378,7 @@ static ssize_t show_in_max(struct device *dev, struct device_attribute *da, 
	return sprintf(buf, "%ld\n", IN_FROM_REG(data->in_max[nr], 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) {

	struct via686a_data *data = dev_get_drvdata(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -398,7 +397,7 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *da, 
	mutex_unlock(&data->update_lock);

	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) {

	struct via686a_data *data = dev_get_drvdata(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -417,44 +416,48 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *da, 
	mutex_unlock(&data->update_lock);

	return count;

}

#define show_in_offset(offset)					\

static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\

		show_in, NULL, offset);				\

static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\

		show_in_min, set_in_min, offset);		\

static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\

		show_in_max, set_in_max, offset);



show_in_offset(0);

show_in_offset(1);

show_in_offset(2);

show_in_offset(3);

show_in_offset(4);

static SENSOR_DEVICE_ATTR_RO(in0_input, in, 0);

static SENSOR_DEVICE_ATTR_RW(in0_min, in_min, 0);

static SENSOR_DEVICE_ATTR_RW(in0_max, in_max, 0);

static SENSOR_DEVICE_ATTR_RO(in1_input, in, 1);

static SENSOR_DEVICE_ATTR_RW(in1_min, in_min, 1);

static SENSOR_DEVICE_ATTR_RW(in1_max, in_max, 1);

static SENSOR_DEVICE_ATTR_RO(in2_input, in, 2);

static SENSOR_DEVICE_ATTR_RW(in2_min, in_min, 2);

static SENSOR_DEVICE_ATTR_RW(in2_max, in_max, 2);

static SENSOR_DEVICE_ATTR_RO(in3_input, in, 3);

static SENSOR_DEVICE_ATTR_RW(in3_min, in_min, 3);

static SENSOR_DEVICE_ATTR_RW(in3_max, in_max, 3);

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);



/* 3 temperatures */

static ssize_t show_temp(struct device *dev, struct device_attribute *da,

static ssize_t temp_show(struct device *dev, struct device_attribute *da,

			 char *buf) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);

	int nr = attr->index;

	return sprintf(buf, "%ld\n", TEMP_FROM_REG10(data->temp[nr]));

}

static ssize_t show_temp_over(struct device *dev, struct device_attribute *da,

static ssize_t temp_over_show(struct device *dev, struct device_attribute *da,

			      char *buf) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);

	int nr = attr->index;

	return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp_over[nr]));

}

static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *da,

static ssize_t temp_hyst_show(struct device *dev, struct device_attribute *da,

			      char *buf) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);

	int nr = attr->index;

	return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp_hyst[nr]));

}

static ssize_t set_temp_over(struct device *dev, struct device_attribute *da,

		const char *buf, size_t count) {

static ssize_t temp_over_store(struct device *dev,

			       struct device_attribute *da, const char *buf,

			       size_t count) {

	struct via686a_data *data = dev_get_drvdata(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);

	int nr = attr->index;
@@ -472,8 +475,9 @@ static ssize_t set_temp_over(struct device *dev, struct device_attribute *da, 
	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *da,

		const char *buf, size_t count) {

static ssize_t temp_hyst_store(struct device *dev,

			       struct device_attribute *da, const char *buf,

			       size_t count) {

	struct via686a_data *data = dev_get_drvdata(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);

	int nr = attr->index;
@@ -491,20 +495,19 @@ static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *da, 
	mutex_unlock(&data->update_lock);

	return count;

}

#define show_temp_offset(offset)					\

static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,		\

		show_temp, NULL, offset - 1);				\

static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,	\

		show_temp_over, set_temp_over, offset - 1);		\

static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR,	\

		show_temp_hyst, set_temp_hyst, offset - 1);



show_temp_offset(1);

show_temp_offset(2);

show_temp_offset(3);

static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);

static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_over, 0);

static SENSOR_DEVICE_ATTR_RW(temp1_max_hyst, temp_hyst, 0);

static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);

static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_over, 1);

static SENSOR_DEVICE_ATTR_RW(temp2_max_hyst, temp_hyst, 1);

static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);

static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_over, 2);

static SENSOR_DEVICE_ATTR_RW(temp3_max_hyst, temp_hyst, 2);



/* 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) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -512,7 +515,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *da, 
	return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[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) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -521,14 +524,14 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute *da, 
		FAN_FROM_REG(data->fan_min[nr],

			     DIV_FROM_REG(data->fan_div[nr])));

}

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) {

	struct via686a_data *data = via686a_update_device(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);

	int nr = attr->index;

	return sprintf(buf, "%d\n", 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) {

	struct via686a_data *data = dev_get_drvdata(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -546,7 +549,7 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *da, 
	mutex_unlock(&data->update_lock);

	return count;

}

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) {

	struct via686a_data *data = dev_get_drvdata(dev);

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -568,16 +571,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da, 
	return count;

}



#define show_fan_offset(offset)						\

static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,			\

		show_fan, NULL, offset - 1);				\

static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\

		show_fan_min, set_fan_min, offset - 1);			\

static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,		\

		show_fan_div, set_fan_div, offset - 1);



show_fan_offset(1);

show_fan_offset(2);

static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);

static SENSOR_DEVICE_ATTR_RW(fan1_min, fan_min, 0);

static SENSOR_DEVICE_ATTR_RW(fan1_div, fan_div, 0);

static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);

static SENSOR_DEVICE_ATTR_RW(fan2_min, fan_min, 1);

static SENSOR_DEVICE_ATTR_RW(fan2_div, fan_div, 1);



/* Alarms */

static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,
@@ -589,23 +588,23 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *attr, 


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)

{

	int bitnr = to_sensor_dev_attr(attr)->index;

	struct via686a_data *data = via686a_update_device(dev);

	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(in4_alarm, S_IRUGO, show_alarm, NULL, 8);

static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);

static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11);

static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 15);

static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);

static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);

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(in4_alarm, alarm, 8);

static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 4);

static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 11);

static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 15);

static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 6);

static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 7);



static ssize_t name_show(struct device *dev, struct device_attribute

			 *devattr, char *buf)
@@ -676,7 +675,6 @@ static struct platform_driver via686a_driver = { 
	.remove		= via686a_remove,

};





/* This is called when the module is loaded */

static int via686a_probe(struct platform_device *pdev)

{