summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-06-19 14:40:24 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-06-19 14:40:24 +0000
commit87431e4ae3d19c8e085e9aa11a61314a358b6c6a (patch)
treed44010d09700ea3b63972b781b7c5cd94dda36c5
parent5a10c1a1b5cde406eabf667f57a61c102084516f (diff)
Avoid using the rfact member of 'struct sensor' which is on its way out.
-rw-r--r--sys/dev/ic/lm78.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ic/lm78.c b/sys/dev/ic/lm78.c
index 44746f58951..577032ba7a5 100644
--- a/sys/dev/ic/lm78.c
+++ b/sys/dev/ic/lm78.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lm78.c,v 1.9 2006/05/07 17:45:16 kettenis Exp $ */
+/* $OpenBSD: lm78.c,v 1.10 2006/06/19 14:40:23 kettenis Exp $ */
/*
* Copyright (c) 2005, 2006 Mark Kettenis
@@ -504,7 +504,6 @@ lm_setup_sensors(struct lm_softc *sc, struct lm_sensor *sensors)
sc->sensors[i].type = sensors[i].type;
strlcpy(sc->sensors[i].desc, sensors[i].desc,
sizeof(sc->sensors[i].desc));
- sc->sensors[i].rfact = sensors[i].rfact;
sc->numsensors++;
}
sc->lm_sensors = sensors;
@@ -535,7 +534,7 @@ lm_refresh_volt(struct lm_softc *sc, int n)
data = sc->lm_readreg(sc, sc->lm_sensors[n].reg);
sensor->value = (data << 4);
- sensor->value *= sensor->rfact;
+ sensor->value *= sc->lm_sensors[n].rfact;
sensor->value /= 10;
}
@@ -621,7 +620,7 @@ wb_refresh_nvolt(struct lm_softc *sc, int n)
data = sc->lm_readreg(sc, sc->lm_sensors[n].reg);
sensor->value = ((data << 4) - WB_VREF);
- sensor->value *= sensor->rfact;
+ sensor->value *= sc->lm_sensors[n].rfact;
sensor->value /= 10;
sensor->value += WB_VREF * 1000;
}