CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:    src
Committed By:   jruoho
Date:           Tue Jun 21 09:49:05 UTC 2011

Modified Files:
        src/sys/dev/acpi: acpi_fan.c acpi_pmtr.c

Log Message:
Revert the previous commit as it was wrong/redundant.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_fan.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_pmtr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/acpi/acpi_fan.c
diff -u src/sys/dev/acpi/acpi_fan.c:1.5 src/sys/dev/acpi/acpi_fan.c:1.6
--- src/sys/dev/acpi/acpi_fan.c:1.5	Mon Jun 20 17:21:50 2011
+++ src/sys/dev/acpi/acpi_fan.c	Tue Jun 21 09:49:05 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_fan.c,v 1.5 2011/06/20 17:21:50 pgoyette Exp $ */
+/*	$NetBSD: acpi_fan.c,v 1.6 2011/06/21 09:49:05 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.5 2011/06/20 17:21:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.6 2011/06/21 09:49:05 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/module.h>
@@ -172,7 +172,6 @@
 
 	acpifan_sensor_state(self);
 	sc->sc_sensor.units = ENVSYS_INDICATOR;
-	sc->sc_sensor.state = ENVSYS_SINVALID;
 
 	(void)strlcpy(sc->sc_sensor.desc, "state", sizeof(sc->sc_sensor.desc));
 

Index: src/sys/dev/acpi/acpi_pmtr.c
diff -u src/sys/dev/acpi/acpi_pmtr.c:1.6 src/sys/dev/acpi/acpi_pmtr.c:1.7
--- src/sys/dev/acpi/acpi_pmtr.c:1.6	Tue Jun 21 03:37:21 2011
+++ src/sys/dev/acpi/acpi_pmtr.c	Tue Jun 21 09:49:05 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_pmtr.c,v 1.6 2011/06/21 03:37:21 jruoho Exp $ */
+/*	$NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.6 2011/06/21 03:37:21 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/module.h>
@@ -338,8 +338,6 @@
 	sc->sc_sensor_o.units = ENVSYS_SWATTS;
 	sc->sc_sensor_i.value_cur = val * 1000;
 	sc->sc_sensor_o.value_cur = val * 1000;
-	sc->sc_sensor_i.state = ENVSYS_SINVALID;
-	sc->sc_sensor_o.state = ENVSYS_SINVALID;
 
 	acpipmtr_sensor_type(self);