Commit 8e757e15 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (adm1031) 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 29168f30

drivers/hwmon/adm1031.c

+97 −104
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ get_fan_auto_nearest(struct adm1031_data *data, int chan, u8 val, u8 reg) 
	return -EINVAL;

}



static ssize_t show_fan_auto_channel(struct device *dev,

static ssize_t fan_auto_channel_show(struct device *dev,

				     struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;
@@ -340,7 +340,7 @@ static ssize_t show_fan_auto_channel(struct device *dev, 
}



static ssize_t

set_fan_auto_channel(struct device *dev, struct device_attribute *attr,

fan_auto_channel_store(struct device *dev, struct device_attribute *attr,

		       const char *buf, size_t count)

{

	struct adm1031_data *data = dev_get_drvdata(dev);
@@ -392,13 +392,11 @@ set_fan_auto_channel(struct device *dev, struct device_attribute *attr, 
	return count;

}



static SENSOR_DEVICE_ATTR(auto_fan1_channel, S_IRUGO | S_IWUSR,

		show_fan_auto_channel, set_fan_auto_channel, 0);

static SENSOR_DEVICE_ATTR(auto_fan2_channel, S_IRUGO | S_IWUSR,

		show_fan_auto_channel, set_fan_auto_channel, 1);

static SENSOR_DEVICE_ATTR_RW(auto_fan1_channel, fan_auto_channel, 0);

static SENSOR_DEVICE_ATTR_RW(auto_fan2_channel, fan_auto_channel, 1);



/* Auto Temps */

static ssize_t show_auto_temp_off(struct device *dev,

static ssize_t auto_temp_off_show(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;
@@ -406,7 +404,7 @@ static ssize_t show_auto_temp_off(struct device *dev, 
	return sprintf(buf, "%d\n",

		       AUTO_TEMP_OFF_FROM_REG(data->auto_temp[nr]));

}

static ssize_t show_auto_temp_min(struct device *dev,

static ssize_t auto_temp_min_show(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;
@@ -415,7 +413,7 @@ static ssize_t show_auto_temp_min(struct device *dev, 
		       AUTO_TEMP_MIN_FROM_REG(data->auto_temp[nr]));

}

static ssize_t

set_auto_temp_min(struct device *dev, struct device_attribute *attr,

auto_temp_min_store(struct device *dev, struct device_attribute *attr,

		    const char *buf, size_t count)

{

	struct adm1031_data *data = dev_get_drvdata(dev);
@@ -436,7 +434,7 @@ set_auto_temp_min(struct device *dev, struct device_attribute *attr, 
	mutex_unlock(&data->update_lock);

	return count;

}

static ssize_t show_auto_temp_max(struct device *dev,

static ssize_t auto_temp_max_show(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;
@@ -445,7 +443,7 @@ static ssize_t show_auto_temp_max(struct device *dev, 
		       AUTO_TEMP_MAX_FROM_REG(data->auto_temp[nr]));

}

static ssize_t

set_auto_temp_max(struct device *dev, struct device_attribute *attr,

auto_temp_max_store(struct device *dev, struct device_attribute *attr,

		    const char *buf, size_t count)

{

	struct adm1031_data *data = dev_get_drvdata(dev);
@@ -468,27 +466,25 @@ set_auto_temp_max(struct device *dev, struct device_attribute *attr, 
	return count;

}



#define auto_temp_reg(offset)						\

static SENSOR_DEVICE_ATTR(auto_temp##offset##_off, S_IRUGO,		\

		show_auto_temp_off, NULL, offset - 1);			\

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

		show_auto_temp_min, set_auto_temp_min, offset - 1);	\

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

		show_auto_temp_max, set_auto_temp_max, offset - 1)



auto_temp_reg(1);

auto_temp_reg(2);

auto_temp_reg(3);

static SENSOR_DEVICE_ATTR_RO(auto_temp1_off, auto_temp_off, 0);

static SENSOR_DEVICE_ATTR_RW(auto_temp1_min, auto_temp_min, 0);

static SENSOR_DEVICE_ATTR_RW(auto_temp1_max, auto_temp_max, 0);

static SENSOR_DEVICE_ATTR_RO(auto_temp2_off, auto_temp_off, 1);

static SENSOR_DEVICE_ATTR_RW(auto_temp2_min, auto_temp_min, 1);

static SENSOR_DEVICE_ATTR_RW(auto_temp2_max, auto_temp_max, 1);

static SENSOR_DEVICE_ATTR_RO(auto_temp3_off, auto_temp_off, 2);

static SENSOR_DEVICE_ATTR_RW(auto_temp3_min, auto_temp_min, 2);

static SENSOR_DEVICE_ATTR_RW(auto_temp3_max, auto_temp_max, 2);



/* pwm */

static ssize_t show_pwm(struct device *dev,

			struct device_attribute *attr, char *buf)

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

			char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;

	struct adm1031_data *data = adm1031_update_device(dev);

	return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr]));

}

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

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

			 const char *buf, size_t count)

{

	struct adm1031_data *data = dev_get_drvdata(dev);
@@ -517,12 +513,10 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, 
	return count;

}



static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 0);

static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 1);

static SENSOR_DEVICE_ATTR(auto_fan1_min_pwm, S_IRUGO | S_IWUSR,

		show_pwm, set_pwm, 0);

static SENSOR_DEVICE_ATTR(auto_fan2_min_pwm, S_IRUGO | S_IWUSR,

		show_pwm, set_pwm, 1);

static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);

static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);

static SENSOR_DEVICE_ATTR_RW(auto_fan1_min_pwm, pwm, 0);

static SENSOR_DEVICE_ATTR_RW(auto_fan2_min_pwm, pwm, 1);



/* Fans */
@@ -572,9 +566,8 @@ static int trust_fan_readings(struct adm1031_data *data, int chan) 
	return res;

}





static ssize_t show_fan(struct device *dev,

			struct device_attribute *attr, char *buf)

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

			char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;

	struct adm1031_data *data = adm1031_update_device(dev);
@@ -585,15 +578,15 @@ static ssize_t show_fan(struct device *dev, 
	return sprintf(buf, "%d\n", value);

}



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 adm1031_data *data = adm1031_update_device(dev);

	return sprintf(buf, "%d\n", FAN_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 adm1031_data *data = adm1031_update_device(dev);
@@ -601,8 +594,9 @@ static ssize_t show_fan_min(struct device *dev, 
		       FAN_FROM_REG(data->fan_min[nr],

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

}

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 adm1031_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;
@@ -625,8 +619,9 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr, 
	mutex_unlock(&data->update_lock);

	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 adm1031_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;
@@ -673,21 +668,16 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, 
	return count;

}



#define 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)



fan_offset(1);

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



/* Temps */

static ssize_t show_temp(struct device *dev,

			 struct device_attribute *attr, char *buf)

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

			 char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;

	struct adm1031_data *data = adm1031_update_device(dev);
@@ -697,7 +687,7 @@ static ssize_t show_temp(struct device *dev, 
	    (((data->ext_temp[nr] >> ((nr - 1) * 3)) & 7));

	return sprintf(buf, "%d\n", TEMP_FROM_REG_EXT(data->temp[nr], ext));

}

static ssize_t show_temp_offset(struct device *dev,

static ssize_t temp_offset_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;
@@ -705,30 +695,30 @@ static ssize_t show_temp_offset(struct device *dev, 
	return sprintf(buf, "%d\n",

		       TEMP_OFFSET_FROM_REG(data->temp_offset[nr]));

}

static ssize_t show_temp_min(struct device *dev,

static ssize_t temp_min_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;

	struct adm1031_data *data = adm1031_update_device(dev);

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

}

static ssize_t show_temp_max(struct device *dev,

static ssize_t temp_max_show(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;

	struct adm1031_data *data = adm1031_update_device(dev);

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

}

static ssize_t show_temp_crit(struct device *dev,

static ssize_t temp_crit_show(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	int nr = to_sensor_dev_attr(attr)->index;

	struct adm1031_data *data = adm1031_update_device(dev);

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[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 adm1031_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;
@@ -748,8 +738,9 @@ static ssize_t set_temp_offset(struct device *dev, 
	mutex_unlock(&data->update_lock);

	return count;

}

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 adm1031_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;
@@ -769,8 +760,9 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, 
	mutex_unlock(&data->update_lock);

	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 adm1031_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;
@@ -790,8 +782,9 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, 
	mutex_unlock(&data->update_lock);

	return count;

}

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

			     const char *buf, size_t count)

static ssize_t temp_crit_store(struct device *dev,

			       struct device_attribute *attr, const char *buf,

			       size_t count)

{

	struct adm1031_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;
@@ -812,21 +805,21 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr, 
	return count;

}



#define temp_reg(offset)						\

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

		show_temp, NULL, offset - 1);				\

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

		show_temp_offset, set_temp_offset, offset - 1);		\

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

		show_temp_min, set_temp_min, offset - 1);		\

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

		show_temp_max, set_temp_max, offset - 1);		\

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

		show_temp_crit, set_temp_crit, offset - 1)



temp_reg(1);

temp_reg(2);

temp_reg(3);

static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);

static SENSOR_DEVICE_ATTR_RW(temp1_offset, temp_offset, 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_crit, temp_crit, 0);

static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1);

static SENSOR_DEVICE_ATTR_RW(temp2_offset, temp_offset, 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_crit, temp_crit, 1);

static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2);

static SENSOR_DEVICE_ATTR_RW(temp3_offset, temp_offset, 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_crit, temp_crit, 2);



/* Alarms */

static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,
@@ -838,29 +831,29 @@ 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, char *buf)

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

			  char *buf)

{

	int bitnr = to_sensor_dev_attr(attr)->index;

	struct adm1031_data *data = adm1031_update_device(dev);

	return sprintf(buf, "%d\n", (data->alarm >> bitnr) & 1);

}



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

static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, show_alarm, NULL, 1);

static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 2);

static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);

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

static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 5);

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

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

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

static SENSOR_DEVICE_ATTR(fan2_fault, S_IRUGO, show_alarm, NULL, 9);

static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO, show_alarm, NULL, 10);

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

static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 12);

static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 13);

static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 14);

static SENSOR_DEVICE_ATTR_RO(fan1_alarm, alarm, 0);

static SENSOR_DEVICE_ATTR_RO(fan1_fault, alarm, 1);

static SENSOR_DEVICE_ATTR_RO(temp2_max_alarm, alarm, 2);

static SENSOR_DEVICE_ATTR_RO(temp2_min_alarm, alarm, 3);

static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 4);

static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 5);

static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 6);

static SENSOR_DEVICE_ATTR_RO(temp1_min_alarm, alarm, 7);

static SENSOR_DEVICE_ATTR_RO(fan2_alarm, alarm, 8);

static SENSOR_DEVICE_ATTR_RO(fan2_fault, alarm, 9);

static SENSOR_DEVICE_ATTR_RO(temp3_max_alarm, alarm, 10);

static SENSOR_DEVICE_ATTR_RO(temp3_min_alarm, alarm, 11);

static SENSOR_DEVICE_ATTR_RO(temp3_crit_alarm, alarm, 12);

static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 13);

static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 14);



/* Update Interval */

static const unsigned int update_intervals[] = {