summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-19 19:13:12 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-19 19:13:12 +0000
commit98182c22350e05340ee87e13186fbae1319c3dd2 (patch)
treeca09629e0676937142300382af23388ee46e2341 /sys
parent03db88335a7985afa7ec55bbcfe24397ed5839fd (diff)
softc's come initialized to 0, you know...
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/acpi/acpi.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index b46d801b4db..bf1533fa408 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.103 2007/11/19 19:10:58 deraadt Exp $ */
+/* $OpenBSD: acpi.c,v 1.104 2007/11/19 19:13:11 deraadt Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -43,9 +43,8 @@
#ifdef ACPI_DEBUG
int acpi_debug = 16;
#endif
-int acpi_enabled = 0;
-int acpi_poll_enabled = 0;
-int acpi_hasprocfvs = 0;
+int acpi_poll_enabled;
+int acpi_hasprocfvs;
#define ACPIEN_RETRIES 15
@@ -420,11 +419,6 @@ acpi_attach(struct device *parent, struct device *self, void *aux)
SIMPLEQ_INIT(&sc->sc_tables);
SIMPLEQ_INIT(&sc->sc_wakedevs);
- sc->sc_fadt = NULL;
- sc->sc_facs = NULL;
- sc->sc_powerbtn = 0;
- sc->sc_sleepbtn = 0;
-
sc->sc_note = malloc(sizeof(struct klist), M_DEVBUF, M_NOWAIT | M_ZERO);
if (sc->sc_note == NULL) {
printf(", can't allocate memory\n");
@@ -480,8 +474,6 @@ acpi_attach(struct device *parent, struct device *self, void *aux)
/* Create opcode hashtable */
aml_hashopcodes();
- acpi_enabled = 1;
-
/* Create Default AML objects */
aml_create_defaultobjects();