Module Name: src
Committed By: cnst
Date: Thu Feb 11 06:54:57 UTC 2010
Modified Files:
src/sys/dev/acpi: atk0110.c
Log Message:
remove unnecessary AIBS_MONLIMITS ifdefs, no binary change; ok pgoyette
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/atk0110.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/atk0110.c
diff -u src/sys/dev/acpi/atk0110.c:1.3 src/sys/dev/acpi/atk0110.c:1.4
--- src/sys/dev/acpi/atk0110.c:1.3 Tue Feb 9 03:32:57 2010
+++ src/sys/dev/acpi/atk0110.c Thu Feb 11 06:54:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atk0110.c,v 1.3 2010/02/09 03:32:57 cnst Exp $ */
+/* $NetBSD: atk0110.c,v 1.4 2010/02/11 06:54:57 cnst 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.3 2010/02/09 03:32:57 cnst Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.4 2010/02/11 06:54:57 cnst Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,6 @@
*/
#define AIBS_MORE_SENSORS
-#define AIBS_MONLIMITS
struct aibs_sensor {
envsys_data_t s;
@@ -66,10 +65,8 @@
static void aibs_attach(device_t, device_t, void *);
static int aibs_detach(device_t, int);
static void aibs_refresh(struct sysmon_envsys *, envsys_data_t *);
-#ifdef AIBS_MONLIMITS
static void aibs_get_limits(struct sysmon_envsys *, envsys_data_t *,
sysmon_envsys_lim_t *);
-#endif
static void aibs_attach_sif(device_t, enum envsys_units);
@@ -109,9 +106,7 @@
sc->sc_sme->sme_name = device_xname(self);
sc->sc_sme->sme_cookie = sc;
sc->sc_sme->sme_refresh = aibs_refresh;
-#ifdef AIBS_MONLIMITS
sc->sc_sme->sme_get_limits = aibs_get_limits;
-#endif
aibs_attach_sif(self, ENVSYS_SVOLTS_DC);
aibs_attach_sif(self, ENVSYS_STEMP);
@@ -247,10 +242,8 @@
as[i].l = oi[2].Integer.Value;
as[i].h = oi[3].Integer.Value;
as[i].s.units = st;
-#ifdef AIBS_MONLIMITS
as[i].s.flags |= ENVSYS_FMONLIMITS;
as[i].s.monitor = true;
-#endif
aprint_verbose_dev(self, "%c%i: "
"0x%08"PRIx64" %20s %5"PRIi64" / %5"PRIi64" "
"0x%"PRIx64"\n",
@@ -360,7 +353,6 @@
s->flags &= ~ENVSYS_FMONNOTSUPP;
}
-#ifdef AIBS_MONLIMITS
static void
aibs_get_limits(struct sysmon_envsys *sme, envsys_data_t *edata,
sysmon_envsys_lim_t *limits)
@@ -420,4 +412,3 @@
break;
}
}
-#endif /* AIBS_MONLIMITS */
