Commit 6cb59e91 authored by Jean Delvare's avatar Jean Delvare Committed by Mark M. Hoffman
Browse files

hwmon: (lm92) Add individual alarm files 



The new libsensors needs these individual alarm files.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
parent 101142c3

drivers/hwmon/lm92.c

+15 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/slab.h>

#include <linux/i2c.h>

#include <linux/hwmon.h>

#include <linux/hwmon-sysfs.h>

#include <linux/err.h>

#include <linux/mutex.h>
@@ -209,6 +210,14 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch 
	return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->temp1_input));

}



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

			  char *buf)

{

	int bitnr = to_sensor_dev_attr(attr)->index;

	struct lm92_data *data = lm92_update_device(dev);

	return sprintf(buf, "%d\n", (data->temp1_input >> bitnr) & 1);

}



static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1_input, NULL);

static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp1_crit,

	set_temp1_crit);
@@ -221,6 +230,9 @@ static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp1_max, 
	set_temp1_max);

static DEVICE_ATTR(temp1_max_hyst, S_IRUGO, show_temp1_max_hyst, NULL);

static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);

static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 2);

static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 0);

static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 1);





/*
@@ -297,7 +309,9 @@ static struct attribute *lm92_attributes[] = { 
	&dev_attr_temp1_max.attr,

	&dev_attr_temp1_max_hyst.attr,

	&dev_attr_alarms.attr,



	&sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,

	&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,

	&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,

	NULL

};