summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormk <mk@openbsd.org>2007-04-22 21:02:25 +0000
committermk <mk@openbsd.org>2007-04-22 21:02:25 +0000
commitffd696648e6644c086ab80a8f8ca5822e9f2561c (patch)
treeec62ad54430ab593053b1fb55fe25bbe59db1d28
parentAdd a TAILQ, aml_nodelist, of devices depending on the dock device to (diff)
downloadwireguard-openbsd-ffd696648e6644c086ab80a8f8ca5822e9f2561c.tar.xz
wireguard-openbsd-ffd696648e6644c086ab80a8f8ca5822e9f2561c.zip
Remove unnecessary local variable in acpidock_status() and kill an XXX
by using STA_PRESENT instead of home-brewed value.
-rw-r--r--sys/dev/acpi/acpidock.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/acpi/acpidock.c b/sys/dev/acpi/acpidock.c
index d6783caa8a6..935669bcaad 100644
--- a/sys/dev/acpi/acpidock.c
+++ b/sys/dev/acpi/acpidock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpidock.c,v 1.21 2007/04/22 20:52:27 mk Exp $ */
+/* $OpenBSD: acpidock.c,v 1.22 2007/04/22 21:02:25 mk Exp $ */
/*
* Copyright (c) 2006,2007 Michael Knudsen <mk@openbsd.org>
*
@@ -121,7 +121,7 @@ int
acpidock_status(struct acpidock_softc *sc)
{
struct aml_value res;
- int rv, sta;
+ int rv;
if (aml_evalname(sc->sc_acpi, sc->sc_devnode, "_STA", 0, NULL,
&res) != 0)
@@ -129,11 +129,9 @@ acpidock_status(struct acpidock_softc *sc)
else
rv = 1;
- sta = aml_val2int(&res);
- sc->sc_sta = sta;
+ sc->sc_sta = aml_val2int(&res);
- /* XXX: _STA bit defines */
- sc->sc_docked = sta & 0x01;
+ sc->sc_docked = sc->sc_sta & STA_PRESENT;
aml_freevalue(&res);