Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2bec7ea authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (smsc47m192) 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 08ea5a87

drivers/hwmon/smsc47m192.c

+78 −68
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct smsc47m192_data *smsc47m192_update_device(struct device *dev) 
}



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

{

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

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -197,7 +197,7 @@ static ssize_t show_in_min(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr], nr));

}



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)

{

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

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -228,7 +228,7 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr, 
	return count;

}



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)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -250,25 +250,33 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr, 
	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)

show_in_offset(5)

show_in_offset(6)

show_in_offset(7)

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

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



/* Temperatures */

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)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -277,8 +285,8 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));

}



static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,

		char *buf)

static ssize_t temp_min_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);

	int nr = sensor_attr->index;
@@ -286,8 +294,8 @@ static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[nr]));

}



static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,

		char *buf)

static ssize_t temp_max_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);

	int nr = sensor_attr->index;
@@ -295,8 +303,9 @@ static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[nr]));

}



static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,

		const char *buf, size_t count)

static ssize_t temp_min_store(struct device *dev,

			      struct device_attribute *attr, const char *buf,

			      size_t count)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);

	int nr = sensor_attr->index;
@@ -317,8 +326,9 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, 
	return count;

}



static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,

		const char *buf, size_t count)

static ssize_t temp_max_store(struct device *dev,

			      struct device_attribute *attr, const char *buf,

			      size_t count)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);

	int nr = sensor_attr->index;
@@ -339,8 +349,8 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, 
	return count;

}



static ssize_t show_temp_offset(struct device *dev, struct device_attribute

		*attr, char *buf)

static ssize_t temp_offset_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);

	int nr = sensor_attr->index;
@@ -348,8 +358,9 @@ static ssize_t show_temp_offset(struct device *dev, struct device_attribute 
	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_offset[nr]));

}



static ssize_t set_temp_offset(struct device *dev, struct device_attribute

		*attr, const char *buf, size_t count)

static ssize_t temp_offset_store(struct device *dev,

				 struct device_attribute *attr,

				 const char *buf, size_t count)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);

	int nr = sensor_attr->index;
@@ -385,19 +396,18 @@ static ssize_t set_temp_offset(struct device *dev, struct device_attribute 
	return count;

}



#define show_temp_index(index)						\

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

		show_temp, NULL, index-1);				\

static SENSOR_DEVICE_ATTR(temp##index##_min, S_IRUGO | S_IWUSR,		\

		show_temp_min, set_temp_min, index-1);			\

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

		show_temp_max, set_temp_max, index-1);			\

static SENSOR_DEVICE_ATTR(temp##index##_offset, S_IRUGO | S_IWUSR,	\

		show_temp_offset, set_temp_offset, index-1);



show_temp_index(1)

show_temp_index(2)

show_temp_index(3)

static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);

static SENSOR_DEVICE_ATTR_RW(temp1_min, temp_min, 0);

static SENSOR_DEVICE_ATTR_RW(temp1_max, temp_max, 0);

static SENSOR_DEVICE_ATTR_RW(temp1_offset, temp_offset, 0);

static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);

static SENSOR_DEVICE_ATTR_RW(temp2_min, temp_min, 1);

static SENSOR_DEVICE_ATTR_RW(temp2_max, temp_max, 1);

static SENSOR_DEVICE_ATTR_RW(temp2_offset, temp_offset, 1);

static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);

static SENSOR_DEVICE_ATTR_RW(temp3_min, temp_min, 2);

static SENSOR_DEVICE_ATTR_RW(temp3_max, temp_max, 2);

static SENSOR_DEVICE_ATTR_RW(temp3_offset, temp_offset, 2);



/* VID */

static ssize_t cpu0_vid_show(struct device *dev,
@@ -434,7 +444,7 @@ static ssize_t vrm_store(struct device *dev, struct device_attribute *attr, 
static DEVICE_ATTR_RW(vrm);



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

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -443,19 +453,19 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%u\n", (data->alarms & nr) ? 1 : 0);

}



static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 0x0010);

static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 0x0020);

static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 0x0040);

static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 0x4000);

static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 0x8000);

static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0x0001);

static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 0x0002);

static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 0x0004);

static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 0x0008);

static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 0x0100);

static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 0x0200);

static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 0x0400);

static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 0x0800);

static SENSOR_DEVICE_ATTR_RO(temp1_alarm, alarm, 0x0010);

static SENSOR_DEVICE_ATTR_RO(temp2_alarm, alarm, 0x0020);

static SENSOR_DEVICE_ATTR_RO(temp3_alarm, alarm, 0x0040);

static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 0x4000);

static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 0x8000);

static SENSOR_DEVICE_ATTR_RO(in0_alarm, alarm, 0x0001);

static SENSOR_DEVICE_ATTR_RO(in1_alarm, alarm, 0x0002);

static SENSOR_DEVICE_ATTR_RO(in2_alarm, alarm, 0x0004);

static SENSOR_DEVICE_ATTR_RO(in3_alarm, alarm, 0x0008);

static SENSOR_DEVICE_ATTR_RO(in4_alarm, alarm, 0x0100);

static SENSOR_DEVICE_ATTR_RO(in5_alarm, alarm, 0x0200);

static SENSOR_DEVICE_ATTR_RO(in6_alarm, alarm, 0x0400);

static SENSOR_DEVICE_ATTR_RO(in7_alarm, alarm, 0x0800);



static struct attribute *smsc47m192_attributes[] = {

	&sensor_dev_attr_in0_input.dev_attr.attr,