[src/trunk]: src/sys/dev/acpi Cosmetics: be pedantic and use AE_CTRL_TERMINAT...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/930359ed1f9b
branches:  trunk
changeset: 754198:930359ed1f9b
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Fri Apr 23 15:37:01 2010 +0000

description:
Cosmetics: be pedantic and use AE_CTRL_TERMINATE instead of AE_ABORT_METHOD
as a condition to break out of a loop.

diffstat:

 sys/dev/acpi/acpi_power.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r b5ef122f5551 -r 930359ed1f9b sys/dev/acpi/acpi_power.c
--- a/sys/dev/acpi/acpi_power.c Fri Apr 23 15:30:30 2010 +0000
+++ b/sys/dev/acpi/acpi_power.c Fri Apr 23 15:37:01 2010 +0000
@@ -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 "