summaryrefslogtreecommitdiff
path: root/sys/dev/acpi
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2007-02-20 22:10:28 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2007-02-20 22:10:28 +0000
commit7de550dee107704f1c2d5758b1697d92de6b6132 (patch)
tree7b54f332abaeec40824d3c262cb3217e54b41d8e /sys/dev/acpi
parente7cf2cbef8ea82ba845cd64f7ebcfebd17dd9c4d (diff)
KNF while in here.
Diffstat (limited to 'sys/dev/acpi')
-rw-r--r--sys/dev/acpi/acpitimer.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/acpi/acpitimer.c b/sys/dev/acpi/acpitimer.c
index 0128b206544..271deab9602 100644
--- a/sys/dev/acpi/acpitimer.c
+++ b/sys/dev/acpi/acpitimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitimer.c,v 1.4 2007/02/19 23:42:39 jordan Exp $ */
+/* $OpenBSD: acpitimer.c,v 1.5 2007/02/20 22:10:27 marco Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -83,12 +83,10 @@ acpitimerattach(struct device *parent, struct device *self, void *aux)
if (psc->sc_fadt->hdr_revision > 1)
rc = acpi_map_address(psc, &psc->sc_fadt->x_pm_tmr_blk, 0,
- psc->sc_fadt->pm_tmr_len,
- &sc->sc_ioh, &sc->sc_iot);
+ psc->sc_fadt->pm_tmr_len, &sc->sc_ioh, &sc->sc_iot);
else
rc = acpi_map_address(psc, NULL, psc->sc_fadt->pm_tmr_blk,
- psc->sc_fadt->pm_tmr_len,
- &sc->sc_ioh, &sc->sc_iot);
+ psc->sc_fadt->pm_tmr_len, &sc->sc_ioh, &sc->sc_iot);
if (rc) {
printf(": can't map i/o space\n");
return;
@@ -121,6 +119,7 @@ acpi_get_timecount(struct timecounter *tc)
u2 = u3;
u3 = bus_space_read_4(sc->sc_iot, sc->sc_ioh, 0);
} while (u1 > u2 || u2 > u3);
+
return (u2);
}
#endif