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

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

ACPICA: Deploy new ACPI_IS_DEBUG_ENABLED macro in debug output code. 



Simplifies check for debug output enables.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 27441887

drivers/acpi/acpica/exdump.c

+10 −9
Original line number Diff line number Diff line
@@ -464,9 +464,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth) 


	ACPI_FUNCTION_NAME(ex_dump_operand)



	    if (!

		((ACPI_LV_EXEC & acpi_dbg_level)

		  && (_COMPONENT & acpi_dbg_layer))) {

	    /* Check if debug output enabled */

	    if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_EXEC, _COMPONENT)) {

		return;

	}
@@ -811,9 +810,10 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags) 
	ACPI_FUNCTION_ENTRY();



	if (!flags) {

		if (!

		    ((ACPI_LV_OBJECTS & acpi_dbg_level)

		      && (_COMPONENT & acpi_dbg_layer))) {



		/* Check if debug output enabled */



		if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_OBJECTS, _COMPONENT)) {

			return;

		}

	}
@@ -999,9 +999,10 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags) 
	}



	if (!flags) {

		if (!

		    ((ACPI_LV_OBJECTS & acpi_dbg_level)

		      && (_COMPONENT & acpi_dbg_layer))) {



		/* Check if debug output enabled */



		if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_OBJECTS, _COMPONENT)) {

			return_VOID;

		}

	}

drivers/acpi/acpica/nsdump.c

+4 −3
Original line number Diff line number Diff line
@@ -77,8 +77,9 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname) 


	ACPI_FUNCTION_NAME(ns_print_pathname);



	if (!(acpi_dbg_level & ACPI_LV_NAMES)

	    || !(acpi_dbg_layer & ACPI_NAMESPACE)) {

	/* Check if debug output enabled */



	if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_NAMES, ACPI_NAMESPACE)) {

		return;

	}
@@ -127,7 +128,7 @@ acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component) 


	/* Do this only if the requested debug level and component are enabled */



	if (!(acpi_dbg_level & level) || !(acpi_dbg_layer & component)) {

	if (!ACPI_IS_DEBUG_ENABLED(level, component)) {

		return_VOID;

	}

drivers/acpi/acpica/rsdump.c

+6 −4
Original line number Diff line number Diff line
@@ -766,8 +766,9 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list) 


	ACPI_FUNCTION_ENTRY();



	if (!(acpi_dbg_level & ACPI_LV_RESOURCES)

	    || !(_COMPONENT & acpi_dbg_layer)) {

	/* Check if debug output enabled */



	if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_RESOURCES, _COMPONENT)) {

		return;

	}
@@ -828,8 +829,9 @@ void acpi_rs_dump_irq_list(u8 * route_table) 


	ACPI_FUNCTION_ENTRY();



	if (!(acpi_dbg_level & ACPI_LV_RESOURCES)

	    || !(_COMPONENT & acpi_dbg_layer)) {

	/* Check if debug output enabled */



	if (!ACPI_IS_DEBUG_ENABLED(ACPI_LV_RESOURCES, _COMPONENT)) {

		return;

	}