From: Erik Schmauss <erik.schmauss@intel.com>
To: linux-acpi@vger.kernel.org
Cc: Bob Moore <robert.moore@intel.com>,
Erik Schmauss <erik.schmauss@intel.com>
Subject: [PATCH 02/15] ACPICA: Update output from ACPI_EXCEPTION macro
Date: Fri, 17 Nov 2017 15:42:17 -0800 [thread overview]
Message-ID: <20171117234230.913-3-erik.schmauss@intel.com> (raw)
In-Reply-To: <20171117234230.913-1-erik.schmauss@intel.com>
From: Bob Moore <robert.moore@intel.com>
ACPICA commit b2858b2cc83e1481950a2c976f62d4e1d758bc85
Changes line prefix from "ACPI Exception" to simply "ACPI Error"
to match the ACPI_ERROR macro. ACPI_EXCEPTION takes the ACPI status
as an argument, decodes and displays it along with the error
message.
Link: https://github.com/acpica/acpica/commit/b2858b2c
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
---
drivers/acpi/acpica/acutils.h | 3 ---
drivers/acpi/acpica/utxferror.c | 8 ++++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 83b75e9db7ef..bb97a18158ec 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -118,9 +118,6 @@ extern const char *acpi_gbl_ptyp_decode[];
#ifndef ACPI_MSG_ERROR
#define ACPI_MSG_ERROR "ACPI Error: "
#endif
-#ifndef ACPI_MSG_EXCEPTION
-#define ACPI_MSG_EXCEPTION "ACPI Exception: "
-#endif
#ifndef ACPI_MSG_WARNING
#define ACPI_MSG_WARNING "ACPI Warning: "
#endif
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 950a1e500bfa..9da4f8ef2e77 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -96,8 +96,8 @@ ACPI_EXPORT_SYMBOL(acpi_error)
*
* RETURN: None
*
- * DESCRIPTION: Print "ACPI Exception" message with module/line/version info
- * and decoded acpi_status.
+ * DESCRIPTION: Print an "ACPI Error" message with module/line/version
+ * info as well as decoded acpi_status.
*
******************************************************************************/
void ACPI_INTERNAL_VAR_XFACE
@@ -111,10 +111,10 @@ acpi_exception(const char *module_name,
/* For AE_OK, just print the message */
if (ACPI_SUCCESS(status)) {
- acpi_os_printf(ACPI_MSG_EXCEPTION);
+ acpi_os_printf(ACPI_MSG_ERROR);
} else {
- acpi_os_printf(ACPI_MSG_EXCEPTION "%s, ",
+ acpi_os_printf(ACPI_MSG_ERROR "%s, ",
acpi_format_exception(status));
}
--
2.13.6
next prev parent reply other threads:[~2017-11-17 23:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-17 23:42 [PATCH 00/15] ACPICA release 20171110 Erik Schmauss
2017-11-17 23:42 ` [PATCH 01/15] ACPICA: Use local 64-bit divide support for string conversions Erik Schmauss
2017-11-17 23:42 ` Erik Schmauss [this message]
2017-11-17 23:42 ` [PATCH 03/15] ACPICA: Add an additional error message for EC timeouts Erik Schmauss
2017-11-17 23:42 ` [PATCH 04/15] ACPICA: iasl: Add SMMUv3 device ID mapping index support Erik Schmauss
2017-11-27 14:31 ` Lorenzo Pieralisi
2017-11-27 16:20 ` Rafael J. Wysocki
2017-11-17 23:42 ` [PATCH 05/15] ACPICA: ACPICA: style edits to utility function output, no functional change Erik Schmauss
2017-11-17 23:42 ` [PATCH 06/15] ACPICA: Trivial fix to spelling mistake in comment Erik Schmauss
2017-11-17 23:42 ` [PATCH 07/15] ACPICA: Enhance error messages from namespace create/lookup operations Erik Schmauss
2017-11-17 23:42 ` [PATCH 08/15] ACPICA: Namespace: fix memory leak from building prefixed pathname Erik Schmauss
2017-11-17 23:42 ` [PATCH 09/15] ACPICA: ACPI 6.0A: Changes to the NFIT ACPI table Erik Schmauss
2017-11-17 23:42 ` [PATCH 10/15] ACPICA: Small typo fix, no functional change Erik Schmauss
2017-11-17 23:42 ` [PATCH 11/15] ACPICA: Debugger: add "background" command for method execution Erik Schmauss
2017-11-17 23:42 ` [PATCH 12/15] ACPICA: Update mutex error messages, no functional change Erik Schmauss
2017-11-17 23:42 ` [PATCH 13/15] ACPICA: Update linkage for get mutex name interface Erik Schmauss
2017-11-17 23:42 ` [PATCH 14/15] ACPICA: ACPI 6.2: Additional PPTT flags Erik Schmauss
2017-11-17 23:42 ` [PATCH 15/15] ACPICA: Update version to 20171110 Erik Schmauss
2017-12-04 14:43 ` [PATCH 00/15] ACPICA release 20171110 Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171117234230.913-3-erik.schmauss@intel.com \
--to=erik.schmauss@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox