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

Commit 2cece01f authored by Guenter Roeck's avatar Guenter Roeck Committed by Jean Delvare
Browse files

hwmon: (it87) Replace macro defining tempX_type sensors with direct definitions 



The macro name show_sensor_offset is confusing since it related to the sensor
type, not an offset - even more so when we introduce offset attributes later on.
Replace it with direct definitions, and replace the show_sensor/set_sensor
function names with show_temp_type/set_temp_type. This also resolves a
checkpatch error.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 929c6a56

drivers/hwmon/it87.c

+11 −10
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static SENSOR_DEVICE_ATTR_2(temp3_min, S_IRUGO | S_IWUSR, show_temp, set_temp, 
static SENSOR_DEVICE_ATTR_2(temp3_max, S_IRUGO | S_IWUSR, show_temp, set_temp,

			    2, 2);



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

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

			      char *buf)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -590,7 +590,8 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *attr, 
		return sprintf(buf, "4\n");  /* thermistor */

	return sprintf(buf, "0\n");      /* disabled */

}

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



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

			     const char *buf, size_t count)

{

	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -626,13 +627,13 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr, 
	mutex_unlock(&data->update_lock);

	return count;

}

#define show_sensor_offset(offset)					\

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

		show_sensor, set_sensor, offset - 1);



show_sensor_offset(1);

show_sensor_offset(2);

show_sensor_offset(3);

static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR, show_temp_type,

			  set_temp_type, 0);

static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR, show_temp_type,

			  set_temp_type, 1);

static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR, show_temp_type,

			  set_temp_type, 2);



/* 3 Fans */