Module Name: src
Committed By: jruoho
Date: Fri Apr 23 15:37:01 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_power.c
Log Message:
Cosmetics: be pedantic and use AE_CTRL_TERMINATE instead of AE_ABORT_METHOD
as a condition to break out of a loop.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_power.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_power.c
diff -u src/sys/dev/acpi/acpi_power.c:1.2 src/sys/dev/acpi/acpi_power.c:1.3
--- src/sys/dev/acpi/acpi_power.c:1.2 Fri Apr 23 15:20:35 2010
+++ src/sys/dev/acpi/acpi_power.c Fri Apr 23 15:37:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_power.c,v 1.2 2010/04/23 15:20:35 jruoho Exp $ */
+/* $NetBSD: acpi_power.c,v 1.3 2010/04/23 15:37:01 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.2 2010/04/23 15:20:35 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.3 2010/04/23 15:37:01 jruoho Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -327,7 +327,7 @@
*/
rv = acpi_foreach_package_object(pkg, acpi_power_res_sta, ad);
- if (ACPI_FAILURE(rv) && rv != AE_ABORT_METHOD)
+ if (ACPI_FAILURE(rv) && rv != AE_CTRL_TERMINATE)
goto out;
if (ACPI_SUCCESS(rv)) {
@@ -641,12 +641,12 @@
return AE_BAD_VALUE;
if ((int)val != ACPI_STA_POW_ON)
- return AE_ABORT_METHOD; /* XXX: Not an error. */
+ return AE_CTRL_TERMINATE; /* XXX: Not an error. */
return AE_OK;
fail:
- if (rv == AE_ABORT_METHOD)
+ if (rv == AE_CTRL_TERMINATE)
rv = AE_ERROR;
ACPI_DEBUG_PRINT((ACPI_DB_DEBUG_OBJECT, "%s: failed to "
