Module Name: src
Committed By: jruoho
Date: Sat Apr 24 19:36:15 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_power.c dalb_acpi.c
Log Message:
Do not use __func__ with ACPI_DEBUG_PRINT (it already adds it).
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_power.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/dalb_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.185 src/sys/dev/acpi/acpi.c:1.186
--- src/sys/dev/acpi/acpi.c:1.185 Sat Apr 24 13:42:18 2010
+++ src/sys/dev/acpi/acpi.c Sat Apr 24 19:36:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.185 2010/04/24 13:42:18 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.186 2010/04/24 19:36:14 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.185 2010/04/24 13:42:18 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.186 2010/04/24 19:36:14 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -1384,7 +1384,7 @@
static const int handler = OSL_NOTIFY_HANDLER;
struct sysmon_pswitch *smpsw = context;
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s: fixed event\n", __func__));
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "fixed event\n"));
(void)AcpiOsExecute(handler, acpi_fixed_button_pressed, smpsw);
@@ -1396,8 +1396,8 @@
{
struct sysmon_pswitch *smpsw = context;
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s: %s fixed button pressed\n",
- __func__, smpsw->smpsw_name));
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+ "%s fixed button pressed\n", smpsw->smpsw_name));
sysmon_pswitch_event(smpsw, PSWITCH_EVENT_PRESSED);
}
Index: src/sys/dev/acpi/acpi_power.c
diff -u src/sys/dev/acpi/acpi_power.c:1.7 src/sys/dev/acpi/acpi_power.c:1.8
--- src/sys/dev/acpi/acpi_power.c:1.7 Sat Apr 24 06:57:10 2010
+++ src/sys/dev/acpi/acpi_power.c Sat Apr 24 19:36:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_power.c,v 1.7 2010/04/24 06:57:10 jruoho Exp $ */
+/* $NetBSD: acpi_power.c,v 1.8 2010/04/24 19:36:14 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.7 2010/04/24 06:57:10 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.8 2010/04/24 19:36:14 jruoho Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -566,8 +566,8 @@
SIMPLEQ_INSERT_TAIL(&res->ref_head, ref, ref_list);
mutex_exit(&res->res_mutex);
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s: %s referenced "
- "by %s?\n", __func__, res->res_name, acpi_xname(hdl)));
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s referenced "
+ "by %s?\n", res->res_name, acpi_xname(hdl)));
return AE_OK;
@@ -575,8 +575,8 @@
mutex_exit(&res->res_mutex);
kmem_free(ref, sizeof(*ref));
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s: %s already referenced "
- "by %s?\n", __func__, res->res_name, acpi_xname(hdl)));
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s already referenced "
+ "by %s?\n", res->res_name, acpi_xname(hdl)));
return AE_OK;
}
@@ -617,8 +617,8 @@
mutex_exit(&res->res_mutex);
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s: %s dereferenced "
- "by %s?\n", __func__, res->res_name, acpi_xname(hdl)));
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s dereferenced "
+ "by %s?\n", res->res_name, acpi_xname(hdl)));
return AE_OK;
}
@@ -654,9 +654,8 @@
if (rv == AE_CTRL_TERMINATE)
rv = AE_ERROR;
- ACPI_DEBUG_PRINT((ACPI_DB_DEBUG_OBJECT, "%s: failed to "
- "evaluate _STA for %s: %s\n", __func__,
- acpi_xname(hdl), AcpiFormatException(rv)));
+ ACPI_DEBUG_PRINT((ACPI_DB_DEBUG_OBJECT, "failed to evaluate _STA "
+ "for %s: %s\n", acpi_xname(hdl), AcpiFormatException(rv)));
return rv;
}
@@ -699,9 +698,8 @@
if (buf.Pointer != NULL)
ACPI_FREE(buf.Pointer);
- ACPI_DEBUG_PRINT((ACPI_DB_DEBUG_OBJECT, "%s: failed to "
- "evaluate %s for %s: %s\n", __func__, path,
- acpi_xname(hdl), AcpiFormatException(rv)));
+ ACPI_DEBUG_PRINT((ACPI_DB_DEBUG_OBJECT, "failed to evaluate %s for "
+ "%s: %s\n", path, acpi_xname(hdl), AcpiFormatException(rv)));
return NULL;
}
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.14 src/sys/dev/acpi/dalb_acpi.c:1.15
--- src/sys/dev/acpi/dalb_acpi.c:1.14 Thu Apr 15 07:02:24 2010
+++ src/sys/dev/acpi/dalb_acpi.c Sat Apr 24 19:36:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.14 2010/04/15 07:02:24 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.15 2010/04/24 19:36:14 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.14 2010/04/15 07:02:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.15 2010/04/24 19:36:14 jruoho Exp $");
/*
* Direct Application Launch Button:
@@ -221,8 +221,7 @@
return;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "%s: %s: invoking sysmon_pswitch_event\n",
- sc->sc_smpsw.smpsw_name, __func__));
+ "invoking %s (wakeup)\n", sc->sc_smpsw.smpsw_name));
sysmon_pswitch_event(&sc->sc_smpsw, PSWITCH_EVENT_PRESSED);
}
@@ -237,8 +236,7 @@
return;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "%s: %s: invoking sysmon_pswitch_event\n",
- sc->sc_smpsw.smpsw_name, __func__));
+ "invoking %s (runtime)\n", sc->sc_smpsw.smpsw_name));
sysmon_pswitch_event(&sc->sc_smpsw, PSWITCH_EVENT_PRESSED);
}
