Skip to content

Commit

Permalink
hwmon: (w83795) Only create fan[1-8]_target files when needed
Browse files Browse the repository at this point in the history
Only create fan[1-8]_target files when the fan in question can be
controlled (PWM output is present.) Also name these files according
to the standard.

Signed-off-by: Jean Delvare <[email protected]>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Oct 28, 2010
1 parent b5f6a90 commit b2cc528
Showing 1 changed file with 4 additions and 23 deletions.
27 changes: 4 additions & 23 deletions drivers/hwmon/w83795.c
Original file line number Diff line number Diff line change
Expand Up @@ -1482,11 +1482,9 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
SENSOR_ATTR_2(fan##index##_div, S_IWUSR | S_IRUGO, \
show_pwm, store_pwm, PWM_DIV, index - 1), \
SENSOR_ATTR_2(pwm##index##_enable, S_IWUSR | S_IRUGO, \
show_pwm_enable, store_pwm_enable, NOT_USED, index - 1) }

#define SENSOR_ATTR_FANIN_TARGET(index) \
SENSOR_ATTR_2(speed_cruise##index##_target, S_IWUSR | S_IRUGO, \
show_fanin, store_fanin, FANIN_TARGET, index - 1)
show_pwm_enable, store_pwm_enable, NOT_USED, index - 1), \
SENSOR_ATTR_2(fan##index##_target, S_IWUSR | S_IRUGO, \
show_fanin, store_fanin, FANIN_TARGET, index - 1) }

#define SENSOR_ATTR_DTS(index) { \
SENSOR_ATTR_2(temp##index##_type, S_IRUGO , \
Expand Down Expand Up @@ -1632,18 +1630,7 @@ static struct sensor_device_attribute_2 w83795_dts[][8] = {
SENSOR_ATTR_DTS(14),
};

static struct sensor_device_attribute_2 w83795_static[] = {
SENSOR_ATTR_FANIN_TARGET(1),
SENSOR_ATTR_FANIN_TARGET(2),
SENSOR_ATTR_FANIN_TARGET(3),
SENSOR_ATTR_FANIN_TARGET(4),
SENSOR_ATTR_FANIN_TARGET(5),
SENSOR_ATTR_FANIN_TARGET(6),
SENSOR_ATTR_FANIN_TARGET(7),
SENSOR_ATTR_FANIN_TARGET(8),
};

static struct sensor_device_attribute_2 w83795_pwm[][6] = {
static struct sensor_device_attribute_2 w83795_pwm[][7] = {
SENSOR_ATTR_PWM(1),
SENSOR_ATTR_PWM(2),
SENSOR_ATTR_PWM(3),
Expand Down Expand Up @@ -1837,12 +1824,6 @@ static int w83795_handle_files(struct device *dev, int (*fn)(struct device *,
}
}

for (i = 0; i < ARRAY_SIZE(w83795_static); i++) {
err = fn(dev, &w83795_static[i].dev_attr);
if (err)
return err;
}

return 0;
}

Expand Down

0 comments on commit b2cc528

Please sign in to comment.