Module Name: src
Committed By: dyoung
Date: Fri Sep 25 20:26:27 UTC 2009
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
Log Message:
Use deviter_first()/deviter_next() instead of accessing alldevs
directly. Compile-tested, only.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/acpi/thinkpad_acpi.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/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.19 src/sys/dev/acpi/thinkpad_acpi.c:1.20
--- src/sys/dev/acpi/thinkpad_acpi.c:1.19 Tue May 12 09:29:46 2009
+++ src/sys/dev/acpi/thinkpad_acpi.c Fri Sep 25 20:26:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.19 2009/05/12 09:29:46 cegger Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.20 2009/09/25 20:26:26 dyoung Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.19 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.20 2009/09/25 20:26:26 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -166,6 +166,7 @@
struct acpi_attach_args *aa = (struct acpi_attach_args *)opaque;
struct sysmon_pswitch *psw;
device_t curdev;
+ deviter_t di;
ACPI_STATUS rv;
ACPI_INTEGER val;
int i;
@@ -187,12 +188,15 @@
}
sc->sc_ecdev = NULL;
- TAILQ_FOREACH(curdev, &alldevs, dv_list)
+ for (curdev = deviter_first(&di, DEVITER_F_ROOT_FIRST);
+ curdev != NULL; curdev = deviter_next(&di))
if (device_is_a(curdev, "acpiecdt") ||
device_is_a(curdev, "acpiec")) {
sc->sc_ecdev = curdev;
break;
}
+ deviter_release(&di);
+
if (sc->sc_ecdev)
aprint_debug_dev(self, "using EC at %s\n",
device_xname(sc->sc_ecdev));
