Module Name: src
Committed By: jmcneill
Date: Tue Aug 25 10:34:08 UTC 2009
Modified Files:
src/sys/dev/acpi: acpi.c acpi_acad.c acpi_bat.c acpi_button.c
acpi_lid.c acpi_tz.c
Log Message:
PR# kern/41179: Incorrect return values from AcpiOsExecute()
ACPICA functions return ACPI_STATUS instead of int, so use it for
consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/acpi_button.c \
src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/acpi/acpi_tz.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.130 src/sys/dev/acpi/acpi.c:1.131
--- src/sys/dev/acpi/acpi.c:1.130 Sun Aug 23 15:16:16 2009
+++ src/sys/dev/acpi/acpi.c Tue Aug 25 10:34:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.130 2009/08/23 15:16:16 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.131 2009/08/25 10:34:08 jmcneill 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.130 2009/08/23 15:16:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.131 2009/08/25 10:34:08 jmcneill Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -1104,7 +1104,7 @@
acpi_fixed_button_handler(void *context)
{
struct sysmon_pswitch *smpsw = context;
- int rv;
+ ACPI_STATUS rv;
#ifdef ACPI_BUT_DEBUG
printf("%s: fixed button handler\n", smpsw->smpsw_name);
Index: src/sys/dev/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.34 src/sys/dev/acpi/acpi_acad.c:1.35
--- src/sys/dev/acpi/acpi_acad.c:1.34 Tue May 12 09:29:46 2009
+++ src/sys/dev/acpi/acpi_acad.c Tue Aug 25 10:34:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.34 2009/05/12 09:29:46 cegger Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.35 2009/08/25 10:34:08 jmcneill Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.34 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.35 2009/08/25 10:34:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,7 +239,7 @@
{
device_t dv = context;
struct acpiacad_softc *sc = device_private(dv);
- int rv;
+ ACPI_STATUS rv;
switch (notify) {
/*
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.71 src/sys/dev/acpi/acpi_bat.c:1.72
--- src/sys/dev/acpi/acpi_bat.c:1.71 Tue May 12 09:50:28 2009
+++ src/sys/dev/acpi/acpi_bat.c Tue Aug 25 10:34:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.71 2009/05/12 09:50:28 cegger Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.72 2009/08/25 10:34:08 jmcneill Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.71 2009/05/12 09:50:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.72 2009/08/25 10:34:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -667,7 +667,7 @@
acpibat_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
{
device_t dv = context;
- int rv;
+ ACPI_STATUS rv;
#ifdef ACPI_BAT_DEBUG
aprint_debug_dev(dv, "received notify message: 0x%x\n", notify);
Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.27 src/sys/dev/acpi/acpi_button.c:1.28
--- src/sys/dev/acpi/acpi_button.c:1.27 Tue Aug 4 14:20:40 2009
+++ src/sys/dev/acpi/acpi_button.c Tue Aug 25 10:34:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.27 2009/08/04 14:20:40 jmcneill Exp $ */
+/* $NetBSD: acpi_button.c,v 1.28 2009/08/25 10:34:08 jmcneill Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.27 2009/08/04 14:20:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.28 2009/08/25 10:34:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -180,7 +180,7 @@
acpibut_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
{
device_t dv = context;
- int rv;
+ ACPI_STATUS rv;
switch (notify) {
case ACPI_NOTIFY_S0PowerButtonPressed:
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.27 src/sys/dev/acpi/acpi_lid.c:1.28
--- src/sys/dev/acpi/acpi_lid.c:1.27 Tue Aug 4 14:20:40 2009
+++ src/sys/dev/acpi/acpi_lid.c Tue Aug 25 10:34:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.27 2009/08/04 14:20:40 jmcneill Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.28 2009/08/25 10:34:08 jmcneill Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.27 2009/08/04 14:20:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.28 2009/08/25 10:34:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -202,7 +202,7 @@
{
device_t dv = context;
struct acpilid_softc *sc = device_private(dv);
- int rv;
+ ACPI_STATUS rv;
switch (notify) {
case ACPI_NOTIFY_LidStatusChanged:
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.45 src/sys/dev/acpi/acpi_tz.c:1.46
--- src/sys/dev/acpi/acpi_tz.c:1.45 Sat Jul 4 13:36:49 2009
+++ src/sys/dev/acpi/acpi_tz.c Tue Aug 25 10:34:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.45 2009/07/04 13:36:49 pgoyette Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.46 2009/08/25 10:34:08 jmcneill Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.45 2009/07/04 13:36:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.46 2009/08/25 10:34:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -517,7 +517,7 @@
device_t dv = opaque;
ACPI_OSD_EXEC_CALLBACK func = NULL;
const char *name;
- int rv;
+ ACPI_STATUS rv;
switch (notify) {
case ACPI_NOTIFY_ThermalZoneStatusChanged:
@@ -538,7 +538,7 @@
KASSERT(func != NULL);
rv = AcpiOsExecute(OSL_NOTIFY_HANDLER, func, dv);
- if (rv != AE_OK)
+ if (ACPI_FAILURE(rv))
aprint_debug_dev(dv, "unable to queue %s\n", name);
}
