summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorpgoyette <pgoyette@NetBSD.org>2010-03-14 18:05:07 +0000
committerpgoyette <pgoyette@NetBSD.org>2010-03-14 18:05:07 +0000
commit89bf6ebb9f39ca693b54d20f2ca4b4db19498832 (patch)
tree4d3dcab37f5ead56ed1c82d496212a2fcdc4d994 /sys/dev
parentd8b50b486b9f83e6cae2d0e1eb370528f04c7271 (diff)
Remove setting of edata->monitor since that member no longer exists.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_bat.c5
-rw-r--r--sys/dev/acpi/acpi_tz.c6
-rw-r--r--sys/dev/acpi/atk0110.c5
-rw-r--r--sys/dev/i2c/sdtemp.c5
-rw-r--r--sys/dev/ic/cac.c5
-rw-r--r--sys/dev/ic/ciss.c5
-rw-r--r--sys/dev/ic/mfi.c5
-rw-r--r--sys/dev/pci/arcmsr.c6
8 files changed, 16 insertions, 26 deletions
diff --git a/sys/dev/acpi/acpi_bat.c b/sys/dev/acpi/acpi_bat.c
index 355b2bd6140..c7f09731cf0 100644
--- a/sys/dev/acpi/acpi_bat.c
+++ b/sys/dev/acpi/acpi_bat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.85 2010/03/08 11:45:45 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.86 2010/03/14 18:05:07 pgoyette Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.85 2010/03/08 11:45:45 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.86 2010/03/14 18:05:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -685,7 +685,6 @@ acpibat_init_envsys(device_t dv)
#undef INITDATA
/* Enable monitoring for the charge state sensor */
- sc->sc_sensor[ACPIBAT_CHARGE_STATE].monitor = true;
sc->sc_sensor[ACPIBAT_CHARGE_STATE].flags |= ENVSYS_FMONSTCHANGED;
/* Disable userland monitoring on these sensors */
diff --git a/sys/dev/acpi/acpi_tz.c b/sys/dev/acpi/acpi_tz.c
index b200fdd596c..998615e708e 100644
--- a/sys/dev/acpi/acpi_tz.c
+++ b/sys/dev/acpi/acpi_tz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.61 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.62 2010/03/14 18:05:07 pgoyette Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.61 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.62 2010/03/14 18:05:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -677,7 +677,6 @@ acpitz_init_envsys(device_t dv)
sc->sc_sme->sme_name = device_xname(dv);
sc->sc_sme->sme_flags = SME_DISABLE_REFRESH;
- sc->sc_temp_sensor.monitor = true;
sc->sc_temp_sensor.flags = ENVSYS_FMONLIMITS | ENVSYS_FMONNOTSUPP;
sc->sc_temp_sensor.units = ENVSYS_STEMP;
strlcpy(sc->sc_temp_sensor.desc,
@@ -686,7 +685,6 @@ acpitz_init_envsys(device_t dv)
goto out;
if (sc->sc_have_fan) {
- sc->sc_fan_sensor.monitor = true;
sc->sc_fan_sensor.flags =
ENVSYS_FMONLIMITS | ENVSYS_FMONNOTSUPP;
sc->sc_fan_sensor.units = ENVSYS_SFANRPM;
diff --git a/sys/dev/acpi/atk0110.c b/sys/dev/acpi/atk0110.c
index 4bb153e9ee0..f5b811b0c93 100644
--- a/sys/dev/acpi/atk0110.c
+++ b/sys/dev/acpi/atk0110.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atk0110.c,v 1.10 2010/03/08 11:54:35 cnst Exp $ */
+/* $NetBSD: atk0110.c,v 1.11 2010/03/14 18:05:07 pgoyette Exp $ */
/* $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.10 2010/03/08 11:54:35 cnst Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.11 2010/03/14 18:05:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -246,7 +246,6 @@ aibs_attach_sif(device_t self, enum envsys_units st)
as[i].h = oi[3].Integer.Value;
as[i].s.units = st;
as[i].s.flags |= ENVSYS_FMONLIMITS;
- as[i].s.monitor = true;
aprint_verbose_dev(self, "%c%i: "
"0x%08"PRIx64" %20s %5"PRIi64" / %5"PRIi64" "
"0x%"PRIx64"\n",
diff --git a/sys/dev/i2c/sdtemp.c b/sys/dev/i2c/sdtemp.c
index c36116bc5f6..ff5134b00bb 100644
--- a/sys/dev/i2c/sdtemp.c
+++ b/sys/dev/i2c/sdtemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.11 2010/02/24 22:37:57 dyoung Exp $ */
+/* $NetBSD: sdtemp.c,v 1.12 2010/03/14 18:05:49 pgoyette Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.11 2010/02/24 22:37:57 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.12 2010/03/14 18:05:49 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -251,7 +251,6 @@ sdtemp_attach(device_t parent, device_t self, void *aux)
sc->sc_sensor->units = ENVSYS_STEMP;
sc->sc_sensor->state = ENVSYS_SINVALID;
sc->sc_sensor->flags |= ENVSYS_FMONLIMITS;
- sc->sc_sensor->monitor = true;
(void)strlcpy(sc->sc_sensor->desc, device_xname(self),
sizeof(sc->sc_sensor->desc));
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index af6dab9cad0..5c869ed8753 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac.c,v 1.49 2009/05/12 14:25:17 cegger Exp $ */
+/* $NetBSD: cac.c,v 1.50 2010/03/14 18:06:28 pgoyette Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.49 2009/05/12 14:25:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.50 2010/03/14 18:06:28 pgoyette Exp $");
#include "bio.h"
@@ -685,7 +685,6 @@ cac_create_sensors(struct cac_softc *sc)
for (i = 0; i < nsensors; i++) {
sc->sc_sensor[i].units = ENVSYS_DRIVE;
- sc->sc_sensor[i].monitor = true;
/* Enable monitoring for drive state changes */
sc->sc_sensor[i].flags |= ENVSYS_FMONSTCHANGED;
/* logical drives */
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 37557f5acf8..e4fbafe86db 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.19 2009/05/12 14:25:17 cegger Exp $ */
+/* $NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $ */
/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.19 2009/05/12 14:25:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.20 2010/03/14 18:06:28 pgoyette Exp $");
#include "bio.h"
@@ -1409,7 +1409,6 @@ ciss_create_sensors(struct ciss_softc *sc)
for (i = 0; i < nsensors; i++) {
sc->sc_sensor[i].units = ENVSYS_DRIVE;
- sc->sc_sensor[i].monitor = true;
/* Enable monitoring for drive state changes */
sc->sc_sensor[i].flags |= ENVSYS_FMONSTCHANGED;
/* logical drives */
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 2fb1dce84f1..ff61a539881 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.33 2010/02/09 00:05:18 msaitoh Exp $ */
+/* $NetBSD: mfi.c,v 1.34 2010/03/14 18:06:28 pgoyette Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.33 2010/02/09 00:05:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.34 2010/03/14 18:06:28 pgoyette Exp $");
#include "bio.h"
@@ -2021,7 +2021,6 @@ mfi_create_sensors(struct mfi_softc *sc)
for (i = 0; i < nsensors; i++) {
sc->sc_sensor[i].units = ENVSYS_DRIVE;
- sc->sc_sensor[i].monitor = true;
/* Enable monitoring for drive state changes */
sc->sc_sensor[i].flags |= ENVSYS_FMONSTCHANGED;
/* logical drives */
diff --git a/sys/dev/pci/arcmsr.c b/sys/dev/pci/arcmsr.c
index aa841fb9535..e4fba333133 100644
--- a/sys/dev/pci/arcmsr.c
+++ b/sys/dev/pci/arcmsr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arcmsr.c,v 1.22 2008/09/23 22:22:41 christos Exp $ */
+/* $NetBSD: arcmsr.c,v 1.23 2010/03/14 18:07:01 pgoyette Exp $ */
/* $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
/*
@@ -21,7 +21,7 @@
#include "bio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.22 2008/09/23 22:22:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.23 2010/03/14 18:07:01 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -1745,7 +1745,6 @@ arc_create_sensors(void *arg)
goto bad;
sc->sc_sensors[count].units = ENVSYS_DRIVE;
- sc->sc_sensors[count].monitor = true;
sc->sc_sensors[count].flags = ENVSYS_FMONSTCHANGED;
/* Skip passthrough volumes */
@@ -1773,7 +1772,6 @@ arc_create_sensors(void *arg)
/* Attach disk sensors for this volume */
for (j = 0; j < bv.bv_nodisk; j++) {
sc->sc_sensors[count].units = ENVSYS_DRIVE;
- sc->sc_sensors[count].monitor = true;
sc->sc_sensors[count].flags = ENVSYS_FMONSTCHANGED;
snprintf(sc->sc_sensors[count].desc,