hwmon: (smsc47m1) Add individual alarm files
The new libsensors needs these individual alarm files. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Juerg Haefliger <juergh at gmail.com> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
This commit is contained in:
Родитель
71062ffcd5
Коммит
1f08af7ea9
|
@ -198,6 +198,14 @@ static ssize_t get_fan_div(struct device *dev, struct device_attribute
|
|||
return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[attr->index]));
|
||||
}
|
||||
|
||||
static ssize_t get_fan_alarm(struct device *dev, struct device_attribute
|
||||
*devattr, char *buf)
|
||||
{
|
||||
int bitnr = to_sensor_dev_attr(devattr)->index;
|
||||
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
|
||||
return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
|
||||
}
|
||||
|
||||
static ssize_t get_pwm(struct device *dev, struct device_attribute
|
||||
*devattr, char *buf)
|
||||
{
|
||||
|
@ -347,6 +355,8 @@ static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
|
|||
get_fan_min, set_fan_min, offset - 1); \
|
||||
static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
|
||||
get_fan_div, set_fan_div, offset - 1); \
|
||||
static SENSOR_DEVICE_ATTR(fan##offset##_alarm, S_IRUGO, get_fan_alarm, \
|
||||
NULL, offset - 1); \
|
||||
static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
|
||||
get_pwm, set_pwm, offset - 1); \
|
||||
static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \
|
||||
|
@ -374,12 +384,15 @@ static struct attribute *smsc47m1_attributes[] = {
|
|||
&sensor_dev_attr_fan1_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan1_min.dev_attr.attr,
|
||||
&sensor_dev_attr_fan1_div.dev_attr.attr,
|
||||
&sensor_dev_attr_fan1_alarm.dev_attr.attr,
|
||||
&sensor_dev_attr_fan2_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan2_min.dev_attr.attr,
|
||||
&sensor_dev_attr_fan2_div.dev_attr.attr,
|
||||
&sensor_dev_attr_fan2_alarm.dev_attr.attr,
|
||||
&sensor_dev_attr_fan3_input.dev_attr.attr,
|
||||
&sensor_dev_attr_fan3_min.dev_attr.attr,
|
||||
&sensor_dev_attr_fan3_div.dev_attr.attr,
|
||||
&sensor_dev_attr_fan3_alarm.dev_attr.attr,
|
||||
|
||||
&sensor_dev_attr_pwm1.dev_attr.attr,
|
||||
&sensor_dev_attr_pwm1_enable.dev_attr.attr,
|
||||
|
@ -533,7 +546,9 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
|
|||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan1_min.dev_attr))
|
||||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan1_div.dev_attr)))
|
||||
&sensor_dev_attr_fan1_div.dev_attr))
|
||||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan1_alarm.dev_attr)))
|
||||
goto error_remove_files;
|
||||
} else
|
||||
dev_dbg(dev, "Fan 1 not enabled by hardware, skipping\n");
|
||||
|
@ -544,7 +559,9 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
|
|||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan2_min.dev_attr))
|
||||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan2_div.dev_attr)))
|
||||
&sensor_dev_attr_fan2_div.dev_attr))
|
||||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan2_alarm.dev_attr)))
|
||||
goto error_remove_files;
|
||||
} else
|
||||
dev_dbg(dev, "Fan 2 not enabled by hardware, skipping\n");
|
||||
|
@ -555,7 +572,9 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
|
|||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan3_min.dev_attr))
|
||||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan3_div.dev_attr)))
|
||||
&sensor_dev_attr_fan3_div.dev_attr))
|
||||
|| (err = device_create_file(dev,
|
||||
&sensor_dev_attr_fan3_alarm.dev_attr)))
|
||||
goto error_remove_files;
|
||||
} else if (data->type == smsc47m2)
|
||||
dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n");
|
||||
|
|
Загрузка…
Ссылка в новой задаче