diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-12-19 22:17:01 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2012-12-19 22:17:01 +0100 |
| commit | 2cece01ffd622ab65a4f5a6704e3a74c1174d2fa (patch) | |
| tree | 80ca67d24770743381e423f157f192e8a03bc1fa | |
| parent | 929c6a5696f5efe7f4213cf9d8b12144a0c0c650 (diff) | |
| download | blackbird-op-linux-2cece01ffd622ab65a4f5a6704e3a74c1174d2fa.tar.gz blackbird-op-linux-2cece01ffd622ab65a4f5a6704e3a74c1174d2fa.zip | |
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: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
| -rw-r--r-- | drivers/hwmon/it87.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index 79a1229d3499..21fb7f24152c 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -576,8 +576,8 @@ 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, - char *buf) +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); int nr = sensor_attr->index; @@ -590,8 +590,9 @@ 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, - const char *buf, size_t count) + +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); int nr = sensor_attr->index; @@ -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 */ |
