* [lm-sensors] [PATCH] hwmon: (lm77) Add individual alarm files
@ 2008-01-03 22:35 Jean Delvare
2008-01-03 22:44 ` Hans de Goede
2008-01-31 13:04 ` Mark M. Hoffman
0 siblings, 2 replies; 3+ messages in thread
From: Jean Delvare @ 2008-01-03 22:35 UTC (permalink / raw)
To: lm-sensors
The new libsensors needs this. As the old library never had support for
the lm77 driver, I even dropped the legacy "alarms" file.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
Michael, could you please test and/or review this patch? Either test
the sysfs files directly or use lm-sensors 3.0.0 and the alarms should
be displayed as needed. Thanks.
drivers/hwmon/lm77.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
--- linux-2.6.24-rc6.orig/drivers/hwmon/lm77.c 2007-12-31 15:09:18.000000000 +0100
+++ linux-2.6.24-rc6/drivers/hwmon/lm77.c 2007-12-31 15:13:43.000000000 +0100
@@ -31,6 +31,7 @@
#include <linux/jiffies.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
#include <linux/err.h>
#include <linux/mutex.h>
@@ -113,7 +114,6 @@ show(temp_input);
show(temp_crit);
show(temp_min);
show(temp_max);
-show(alarms);
/* read routines for hysteresis values */
static ssize_t show_temp_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
@@ -186,6 +186,14 @@ static ssize_t set_temp_crit(struct devi
return count;
}
+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ int bitnr = to_sensor_dev_attr(attr)->index;
+ struct lm77_data *data = lm77_update_device(dev);
+ return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
+}
+
static DEVICE_ATTR(temp1_input, S_IRUGO,
show_temp_input, NULL);
static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO,
@@ -202,8 +210,9 @@ static DEVICE_ATTR(temp1_min_hyst, S_IRU
static DEVICE_ATTR(temp1_max_hyst, S_IRUGO,
show_temp_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);
static int lm77_attach_adapter(struct i2c_adapter *adapter)
{
@@ -220,8 +229,9 @@ static struct attribute *lm77_attributes
&dev_attr_temp1_crit_hyst.attr,
&dev_attr_temp1_min_hyst.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
};
--
Jean Delvare
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [lm-sensors] [PATCH] hwmon: (lm77) Add individual alarm files
2008-01-03 22:35 [lm-sensors] [PATCH] hwmon: (lm77) Add individual alarm files Jean Delvare
@ 2008-01-03 22:44 ` Hans de Goede
2008-01-31 13:04 ` Mark M. Hoffman
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2008-01-03 22:44 UTC (permalink / raw)
To: lm-sensors
Looks good,
Acked-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Regards,
Hans
Jean Delvare wrote:
> The new libsensors needs this. As the old library never had support for
> the lm77 driver, I even dropped the legacy "alarms" file.
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> ---
> Michael, could you please test and/or review this patch? Either test
> the sysfs files directly or use lm-sensors 3.0.0 and the alarms should
> be displayed as needed. Thanks.
>
> drivers/hwmon/lm77.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> --- linux-2.6.24-rc6.orig/drivers/hwmon/lm77.c 2007-12-31 15:09:18.000000000 +0100
> +++ linux-2.6.24-rc6/drivers/hwmon/lm77.c 2007-12-31 15:13:43.000000000 +0100
> @@ -31,6 +31,7 @@
> #include <linux/jiffies.h>
> #include <linux/i2c.h>
> #include <linux/hwmon.h>
> +#include <linux/hwmon-sysfs.h>
> #include <linux/err.h>
> #include <linux/mutex.h>
>
> @@ -113,7 +114,6 @@ show(temp_input);
> show(temp_crit);
> show(temp_min);
> show(temp_max);
> -show(alarms);
>
> /* read routines for hysteresis values */
> static ssize_t show_temp_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
> @@ -186,6 +186,14 @@ static ssize_t set_temp_crit(struct devi
> return count;
> }
>
> +static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + int bitnr = to_sensor_dev_attr(attr)->index;
> + struct lm77_data *data = lm77_update_device(dev);
> + return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
> +}
> +
> static DEVICE_ATTR(temp1_input, S_IRUGO,
> show_temp_input, NULL);
> static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO,
> @@ -202,8 +210,9 @@ static DEVICE_ATTR(temp1_min_hyst, S_IRU
> static DEVICE_ATTR(temp1_max_hyst, S_IRUGO,
> show_temp_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);
>
> static int lm77_attach_adapter(struct i2c_adapter *adapter)
> {
> @@ -220,8 +229,9 @@ static struct attribute *lm77_attributes
> &dev_attr_temp1_crit_hyst.attr,
> &dev_attr_temp1_min_hyst.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
> };
>
>
>
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [lm-sensors] [PATCH] hwmon: (lm77) Add individual alarm files
2008-01-03 22:35 [lm-sensors] [PATCH] hwmon: (lm77) Add individual alarm files Jean Delvare
2008-01-03 22:44 ` Hans de Goede
@ 2008-01-31 13:04 ` Mark M. Hoffman
1 sibling, 0 replies; 3+ messages in thread
From: Mark M. Hoffman @ 2008-01-31 13:04 UTC (permalink / raw)
To: lm-sensors
Hi Jean:
* Jean Delvare <khali@linux-fr.org> [2008-01-03 23:35:33 +0100]:
> The new libsensors needs this. As the old library never had support for
> the lm77 driver, I even dropped the legacy "alarms" file.
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> ---
> Michael, could you please test and/or review this patch? Either test
> the sysfs files directly or use lm-sensors 3.0.0 and the alarms should
> be displayed as needed. Thanks.
>
> drivers/hwmon/lm77.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
Applied to hwmon-2.6.git/testing, thanks.
--
Mark M. Hoffman
mhoffman@lightlink.com
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-01-31 13:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-03 22:35 [lm-sensors] [PATCH] hwmon: (lm77) Add individual alarm files Jean Delvare
2008-01-03 22:44 ` Hans de Goede
2008-01-31 13:04 ` Mark M. Hoffman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.