summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-06-19 14:43:55 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-06-19 14:43:55 +0000
commitb6696d46af8c8d0ef269fc5504a30c938c5a8694 (patch)
treeef0a95b0f7990e4cdbc4e50f75938ee6522aa794
parent87431e4ae3d19c8e085e9aa11a61314a358b6c6a (diff)
Do not bother initializing the rfact member of `struct sensor'; it is on its
way out anyway.
-rw-r--r--sys/dev/isa/aps.c10
-rw-r--r--sys/dev/pci/viaenv.c3
2 files changed, 2 insertions, 11 deletions
diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c
index 99e0b40fcea..0fb04c3ed4b 100644
--- a/sys/dev/isa/aps.c
+++ b/sys/dev/isa/aps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aps.c,v 1.7 2006/04/10 00:57:54 deraadt Exp $ */
+/* $OpenBSD: aps.c,v 1.8 2006/06/19 14:43:54 kettenis Exp $ */
/*
* Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
*
@@ -151,12 +151,10 @@ aps_attach(struct device *parent, struct device *self, void *aux)
sc->sensors[APS_SENSOR_XACCEL].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_XACCEL].desc,
sizeof(sc->sensors[APS_SENSOR_XACCEL].desc), "X_ACCEL");
- sc->sensors[APS_SENSOR_XACCEL].rfact = 1;
sc->sensors[APS_SENSOR_YACCEL].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_YACCEL].desc,
sizeof(sc->sensors[APS_SENSOR_YACCEL].desc), "Y_ACCEL");
- sc->sensors[APS_SENSOR_YACCEL].rfact = 1;
sc->sensors[APS_SENSOR_TEMP1].type = SENSOR_TEMP;
snprintf(sc->sensors[APS_SENSOR_TEMP1].desc,
@@ -169,32 +167,26 @@ aps_attach(struct device *parent, struct device *self, void *aux)
sc->sensors[APS_SENSOR_XVAR].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_XVAR].desc,
sizeof(sc->sensors[APS_SENSOR_XVAR].desc), "X_VAR");
- sc->sensors[APS_SENSOR_XVAR].rfact = 1;
sc->sensors[APS_SENSOR_YVAR].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_YVAR].desc,
sizeof(sc->sensors[APS_SENSOR_YVAR].desc), "Y_VAR");
- sc->sensors[APS_SENSOR_YVAR].rfact = 1;
sc->sensors[APS_SENSOR_UNK].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_UNK].desc,
sizeof(sc->sensors[APS_SENSOR_UNK].desc), "unknown");
- sc->sensors[APS_SENSOR_YVAR].rfact = 1;
sc->sensors[APS_SENSOR_KBACT].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_KBACT].desc,
sizeof(sc->sensors[APS_SENSOR_KBACT].desc), "Keyboard Active");
- sc->sensors[APS_SENSOR_KBACT].rfact = 1;
sc->sensors[APS_SENSOR_MSACT].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_MSACT].desc,
sizeof(sc->sensors[APS_SENSOR_MSACT].desc), "Mouse Active");
- sc->sensors[APS_SENSOR_MSACT].rfact = 1;
sc->sensors[APS_SENSOR_LIDOPEN].type = SENSOR_INTEGER;
snprintf(sc->sensors[APS_SENSOR_LIDOPEN].desc,
sizeof(sc->sensors[APS_SENSOR_LIDOPEN].desc), "Lid Open");
- sc->sensors[APS_SENSOR_LIDOPEN].rfact = 1;
/* stop hiding and report to the authorities */
for (i = 0; i < sc->numsensors; i++) {
diff --git a/sys/dev/pci/viaenv.c b/sys/dev/pci/viaenv.c
index 1ca3fcc351e..9f7a16fb672 100644
--- a/sys/dev/pci/viaenv.c
+++ b/sys/dev/pci/viaenv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viaenv.c,v 1.7 2006/01/19 17:08:40 grange Exp $ */
+/* $OpenBSD: viaenv.c,v 1.8 2006/06/19 14:43:54 kettenis Exp $ */
/* $NetBSD: viaenv.c,v 1.9 2002/10/02 16:51:59 thorpej Exp $ */
/*
@@ -305,7 +305,6 @@ viaenv_attach(struct device * parent, struct device * self, void *aux)
for (i = 5; i <= 9; ++i) {
sc->sc_data[i].type = SENSOR_VOLTS_DC;
- sc->sc_data[i].rfact = 1; /* what is this used for? */
}
strlcpy(sc->sc_data[5].desc, "VSENS1",
sizeof(sc->sc_data[5].desc)); /* CPU core (2V) */