Module Name: src
Committed By: jruoho
Date: Tue Mar 16 08:02:01 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c
Log Message:
Remove the call to AcpiGetType() in acpi_make_devnode(). This is the same
information as ACPI_DEVICE_INFO::Type, obtained later by AcpiGetObjectInfo().
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/dev/acpi/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/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.160 src/sys/dev/acpi/acpi.c:1.161
--- src/sys/dev/acpi/acpi.c:1.160 Tue Mar 16 05:48:42 2010
+++ src/sys/dev/acpi/acpi.c Tue Mar 16 08:02:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.160 2010/03/16 05:48:42 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.161 2010/03/16 08:02:01 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.160 2010/03/16 05:48:42 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.161 2010/03/16 08:02:01 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -874,18 +874,12 @@
ACPI_STATUS rv;
int clear, i;
- rv = AcpiGetType(handle, &type);
+ rv = AcpiGetObjectInfo(handle, &devinfo);
if (ACPI_FAILURE(rv))
return AE_OK; /* Do not terminate the walk. */
- rv = AcpiGetObjectInfo(handle, &devinfo);
-
- if (ACPI_FAILURE(rv)) {
- aprint_debug_dev(sc->sc_dev, "failed to get object "
- "information: %s\n", AcpiFormatException(rv));
- return AE_OK;
- }
+ type = devinfo->Type;
switch (type) {
