summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjruoho <jruoho@NetBSD.org>2010-04-23 15:37:01 +0000
committerjruoho <jruoho@NetBSD.org>2010-04-23 15:37:01 +0000
commitf7be22cf8e786a9d98ba841a84b539c6d862f0d4 (patch)
tree7f8995d276622b0742a914cbf422eb57b99a7d32 /sys/dev
parentedefcdeffb96ef1e8d04689a00f76082179c58b3 (diff)
Cosmetics: be pedantic and use AE_CTRL_TERMINATE instead of AE_ABORT_METHOD
as a condition to break out of a loop.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_power.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/acpi/acpi_power.c b/sys/dev/acpi/acpi_power.c
index 3a22a388ca9..f40245a218a 100644
--- a/sys/dev/acpi/acpi_power.c
+++ b/sys/dev/acpi/acpi_power.c
@@ -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 @@ acpi_power_get_indirect(struct acpi_devnode *ad)
*/
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 @@ acpi_power_res_sta(ACPI_OBJECT *elm, void *arg)
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 "