Commit 0ad85c07 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (ds1621) 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/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 ba949ed6

drivers/hwmon/ds1621.c

+9 −11
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev) 
	return data;

}



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 sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -243,7 +243,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da, 
		       DS1621_TEMP_FROM_REG(data->temp[attr->index]));

}



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

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

			  const char *buf, size_t count)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -270,7 +270,7 @@ static ssize_t alarms_show(struct device *dev, struct device_attribute *da, 
	return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf));

}



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

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

			  char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
@@ -319,13 +319,11 @@ static ssize_t update_interval_store(struct device *dev, 
static DEVICE_ATTR_RO(alarms);

static DEVICE_ATTR_RW(update_interval);



static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);

static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp, 1);

static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp, 2);

static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL,

		DS1621_ALARM_TEMP_LOW);

static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL,

		DS1621_ALARM_TEMP_HIGH);

static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0);

static SENSOR_DEVICE_ATTR_RW(temp1_min, temp, 1);

static SENSOR_DEVICE_ATTR_RW(temp1_max, temp, 2);

static SENSOR_DEVICE_ATTR_RO(temp1_min_alarm, alarm, DS1621_ALARM_TEMP_LOW);

static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, DS1621_ALARM_TEMP_HIGH);



static struct attribute *ds1621_attributes[] = {

	&sensor_dev_attr_temp1_input.dev_attr.attr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE