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

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

hwmon: (powr1220) 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 86b9f565

drivers/hwmon/powr1220.c

+52 −92
Original line number Diff line number Diff line
@@ -177,8 +177,9 @@ static int powr1220_read_adc(struct device *dev, int ch_num) 
}



/* Shows the voltage associated with the specified ADC channel */

static ssize_t powr1220_show_voltage(struct device *dev,

	struct device_attribute *dev_attr, char *buf)

static ssize_t powr1220_voltage_show(struct device *dev,

				     struct device_attribute *dev_attr,

				     char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr);

	int adc_val = powr1220_read_adc(dev, attr->index);
@@ -190,7 +191,7 @@ static ssize_t powr1220_show_voltage(struct device *dev, 
}



/* Shows the maximum setting associated with the specified ADC channel */

static ssize_t powr1220_show_max(struct device *dev,

static ssize_t powr1220_max_show(struct device *dev,

				 struct device_attribute *dev_attr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr);
@@ -200,100 +201,59 @@ static ssize_t powr1220_show_max(struct device *dev, 
}



/* Shows the label associated with the specified ADC channel */

static ssize_t powr1220_show_label(struct device *dev,

	struct device_attribute *dev_attr, char *buf)

static ssize_t powr1220_label_show(struct device *dev,

				   struct device_attribute *dev_attr,

				   char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(dev_attr);



	return sprintf(buf, "%s\n", input_names[attr->index]);

}



static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON1);

static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON2);

static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON3);

static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON4);

static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON5);

static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON6);

static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON7);

static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON8);

static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON9);

static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON10);

static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON11);

static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, powr1220_show_voltage, NULL,

	VMON12);

static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, powr1220_show_voltage, NULL,

	VCCA);

static SENSOR_DEVICE_ATTR(in13_input, S_IRUGO, powr1220_show_voltage, NULL,

	VCCINP);



static SENSOR_DEVICE_ATTR(in0_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON1);

static SENSOR_DEVICE_ATTR(in1_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON2);

static SENSOR_DEVICE_ATTR(in2_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON3);

static SENSOR_DEVICE_ATTR(in3_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON4);

static SENSOR_DEVICE_ATTR(in4_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON5);

static SENSOR_DEVICE_ATTR(in5_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON6);

static SENSOR_DEVICE_ATTR(in6_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON7);

static SENSOR_DEVICE_ATTR(in7_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON8);

static SENSOR_DEVICE_ATTR(in8_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON9);

static SENSOR_DEVICE_ATTR(in9_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON10);

static SENSOR_DEVICE_ATTR(in10_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON11);

static SENSOR_DEVICE_ATTR(in11_highest, S_IRUGO, powr1220_show_max, NULL,

	VMON12);

static SENSOR_DEVICE_ATTR(in12_highest, S_IRUGO, powr1220_show_max, NULL,

	VCCA);

static SENSOR_DEVICE_ATTR(in13_highest, S_IRUGO, powr1220_show_max, NULL,

	VCCINP);



static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, powr1220_show_label, NULL,

	VMON1);

static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, powr1220_show_label, NULL,

	VMON2);

static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, powr1220_show_label, NULL,

	VMON3);

static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, powr1220_show_label, NULL,

	VMON4);

static SENSOR_DEVICE_ATTR(in4_label, S_IRUGO, powr1220_show_label, NULL,

	VMON5);

static SENSOR_DEVICE_ATTR(in5_label, S_IRUGO, powr1220_show_label, NULL,

	VMON6);

static SENSOR_DEVICE_ATTR(in6_label, S_IRUGO, powr1220_show_label, NULL,

	VMON7);

static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, powr1220_show_label, NULL,

	VMON8);

static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, powr1220_show_label, NULL,

	VMON9);

static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, powr1220_show_label, NULL,

	VMON10);

static SENSOR_DEVICE_ATTR(in10_label, S_IRUGO, powr1220_show_label, NULL,

	VMON11);

static SENSOR_DEVICE_ATTR(in11_label, S_IRUGO, powr1220_show_label, NULL,

	VMON12);

static SENSOR_DEVICE_ATTR(in12_label, S_IRUGO, powr1220_show_label, NULL,

	VCCA);

static SENSOR_DEVICE_ATTR(in13_label, S_IRUGO, powr1220_show_label, NULL,

	VCCINP);

static SENSOR_DEVICE_ATTR_RO(in0_input, powr1220_voltage, VMON1);

static SENSOR_DEVICE_ATTR_RO(in1_input, powr1220_voltage, VMON2);

static SENSOR_DEVICE_ATTR_RO(in2_input, powr1220_voltage, VMON3);

static SENSOR_DEVICE_ATTR_RO(in3_input, powr1220_voltage, VMON4);

static SENSOR_DEVICE_ATTR_RO(in4_input, powr1220_voltage, VMON5);

static SENSOR_DEVICE_ATTR_RO(in5_input, powr1220_voltage, VMON6);

static SENSOR_DEVICE_ATTR_RO(in6_input, powr1220_voltage, VMON7);

static SENSOR_DEVICE_ATTR_RO(in7_input, powr1220_voltage, VMON8);

static SENSOR_DEVICE_ATTR_RO(in8_input, powr1220_voltage, VMON9);

static SENSOR_DEVICE_ATTR_RO(in9_input, powr1220_voltage, VMON10);

static SENSOR_DEVICE_ATTR_RO(in10_input, powr1220_voltage, VMON11);

static SENSOR_DEVICE_ATTR_RO(in11_input, powr1220_voltage, VMON12);

static SENSOR_DEVICE_ATTR_RO(in12_input, powr1220_voltage, VCCA);

static SENSOR_DEVICE_ATTR_RO(in13_input, powr1220_voltage, VCCINP);



static SENSOR_DEVICE_ATTR_RO(in0_highest, powr1220_max, VMON1);

static SENSOR_DEVICE_ATTR_RO(in1_highest, powr1220_max, VMON2);

static SENSOR_DEVICE_ATTR_RO(in2_highest, powr1220_max, VMON3);

static SENSOR_DEVICE_ATTR_RO(in3_highest, powr1220_max, VMON4);

static SENSOR_DEVICE_ATTR_RO(in4_highest, powr1220_max, VMON5);

static SENSOR_DEVICE_ATTR_RO(in5_highest, powr1220_max, VMON6);

static SENSOR_DEVICE_ATTR_RO(in6_highest, powr1220_max, VMON7);

static SENSOR_DEVICE_ATTR_RO(in7_highest, powr1220_max, VMON8);

static SENSOR_DEVICE_ATTR_RO(in8_highest, powr1220_max, VMON9);

static SENSOR_DEVICE_ATTR_RO(in9_highest, powr1220_max, VMON10);

static SENSOR_DEVICE_ATTR_RO(in10_highest, powr1220_max, VMON11);

static SENSOR_DEVICE_ATTR_RO(in11_highest, powr1220_max, VMON12);

static SENSOR_DEVICE_ATTR_RO(in12_highest, powr1220_max, VCCA);

static SENSOR_DEVICE_ATTR_RO(in13_highest, powr1220_max, VCCINP);



static SENSOR_DEVICE_ATTR_RO(in0_label, powr1220_label, VMON1);

static SENSOR_DEVICE_ATTR_RO(in1_label, powr1220_label, VMON2);

static SENSOR_DEVICE_ATTR_RO(in2_label, powr1220_label, VMON3);

static SENSOR_DEVICE_ATTR_RO(in3_label, powr1220_label, VMON4);

static SENSOR_DEVICE_ATTR_RO(in4_label, powr1220_label, VMON5);

static SENSOR_DEVICE_ATTR_RO(in5_label, powr1220_label, VMON6);

static SENSOR_DEVICE_ATTR_RO(in6_label, powr1220_label, VMON7);

static SENSOR_DEVICE_ATTR_RO(in7_label, powr1220_label, VMON8);

static SENSOR_DEVICE_ATTR_RO(in8_label, powr1220_label, VMON9);

static SENSOR_DEVICE_ATTR_RO(in9_label, powr1220_label, VMON10);

static SENSOR_DEVICE_ATTR_RO(in10_label, powr1220_label, VMON11);

static SENSOR_DEVICE_ATTR_RO(in11_label, powr1220_label, VMON12);

static SENSOR_DEVICE_ATTR_RO(in12_label, powr1220_label, VCCA);

static SENSOR_DEVICE_ATTR_RO(in13_label, powr1220_label, VCCINP);



static struct attribute *powr1220_attrs[] = {

	&sensor_dev_attr_in0_input.dev_attr.attr,