diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-10-05 16:14:37 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-10-05 16:14:37 +0000 |
| commit | 88641ce7ee3d2ba1f49dc10b93ae289505d3ca63 (patch) | |
| tree | 74d3cdb6ca6f0e6e9b9475847897e51f7af2601e | |
| parent | Zapped unused function rcs_tag_resolve. (diff) | |
| download | wireguard-openbsd-88641ce7ee3d2ba1f49dc10b93ae289505d3ca63.tar.xz wireguard-openbsd-88641ce7ee3d2ba1f49dc10b93ae289505d3ca63.zip | |
hide use of our global acpi_softc pointer a bit better
| -rw-r--r-- | sys/dev/acpi/acpi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 9aa906c8aba..bb0bf640da9 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.213 2010/09/29 19:45:34 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.214 2010/10/05 16:14:37 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -1315,14 +1315,15 @@ acpi_reset(void) struct acpi_fadt *fadt; u_int32_t reset_as, reset_len; u_int32_t value; + struct acpi_softc *sc = acpi_softc; - fadt = acpi_softc->sc_fadt; + fadt = sc->sc_fadt; /* * RESET_REG_SUP is not properly set in some implementations, * but not testing against it breaks more machines than it fixes */ - if (acpi_softc->sc_revision <= 1 || + if (sc->sc_revision <= 1 || !(fadt->flags & FADT_RESET_REG_SUP) || fadt->reset_reg.address == 0) return; @@ -1336,7 +1337,7 @@ acpi_reset(void) if (reset_len == 0) reset_len = reset_as; - acpi_gasio(acpi_softc, ACPI_IOWRITE, + acpi_gasio(sc, ACPI_IOWRITE, fadt->reset_reg.address_space_id, fadt->reset_reg.address, reset_as, reset_len, &value); |