Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e814109b authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Update output from ACPI_EXCEPTION macro 

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: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent db53f7f0

drivers/acpi/acpica/acutils.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -118,9 +118,6 @@ extern const char *acpi_gbl_ptyp_decode[]; 
#ifndef ACPI_MSG_ERROR

#ifndef ACPI_MSG_ERROR

#define ACPI_MSG_ERROR          "ACPI Error: "

#define ACPI_MSG_ERROR          "ACPI Error: "

#endif

#endif

#ifndef ACPI_MSG_EXCEPTION

#define ACPI_MSG_EXCEPTION      "ACPI Exception: "

#endif

#ifndef ACPI_MSG_WARNING

#ifndef ACPI_MSG_WARNING

#define ACPI_MSG_WARNING        "ACPI Warning: "

#define ACPI_MSG_WARNING        "ACPI Warning: "

#endif

#endif

drivers/acpi/acpica/utxferror.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -96,8 +96,8 @@ ACPI_EXPORT_SYMBOL(acpi_error) 
 *

 *

 * RETURN:      None

 * RETURN:      None

 *

 *

 * DESCRIPTION: Print "ACPI Exception" message with module/line/version info

 * DESCRIPTION: Print an "ACPI Error" message with module/line/version

 *              and decoded acpi_status.

 *              info as well as decoded acpi_status.

 *

 *

 ******************************************************************************/

 ******************************************************************************/

void ACPI_INTERNAL_VAR_XFACE

void ACPI_INTERNAL_VAR_XFACE
@@ -111,10 +111,10 @@ acpi_exception(const char *module_name, 
	/* For AE_OK, just print the message */

	/* For AE_OK, just print the message */





	if (ACPI_SUCCESS(status)) {

	if (ACPI_SUCCESS(status)) {

		acpi_os_printf(ACPI_MSG_EXCEPTION);

		acpi_os_printf(ACPI_MSG_ERROR);





	} else {

	} else {

		acpi_os_printf(ACPI_MSG_EXCEPTION "%s, ",

		acpi_os_printf(ACPI_MSG_ERROR "%s, ",

			       acpi_format_exception(status));

			       acpi_format_exception(status));

	}

	}