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

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

ACPICA: Regression fix: reinstate safe exit macros 



Removal caused a regression on at least FreeBSD. This fix
reinstates the macros.

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 c39660b2

drivers/acpi/acpica/dsutils.c

+5 −5
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, 


	if (!op) {

		ACPI_ERROR((AE_INFO, "Null Op"));

		return_VALUE(TRUE);

		return_UINT8(TRUE);

	}



	/*
@@ -210,7 +210,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, 
				  "At Method level, result of [%s] not used\n",

				  acpi_ps_get_opcode_name(op->common.

							  aml_opcode)));

		return_VALUE(FALSE);

		return_UINT8(FALSE);

	}



	/* Get info on the parent. The root_op is AML_SCOPE */
@@ -219,7 +219,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, 
	    acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);

	if (parent_info->class == AML_CLASS_UNKNOWN) {

		ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op));

		return_VALUE(FALSE);

		return_UINT8(FALSE);

	}



	/*
@@ -307,7 +307,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, 
			  acpi_ps_get_opcode_name(op->common.parent->common.

						  aml_opcode), op));



	return_VALUE(TRUE);

	return_UINT8(TRUE);



      result_not_used:

	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
@@ -316,7 +316,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, 
			  acpi_ps_get_opcode_name(op->common.parent->common.

						  aml_opcode), op));



	return_VALUE(FALSE);

	return_UINT8(FALSE);

}



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

drivers/acpi/acpica/evgpe.c

+3 −3
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, 
		if (ACPI_FAILURE(status)) {

			ACPI_EXCEPTION((AE_INFO, status,

					"Unable to clear GPE%02X", gpe_number));

			return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);

			return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);

		}

	}
@@ -724,7 +724,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, 
	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status,

				"Unable to disable GPE%02X", gpe_number));

		return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);

		return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);

	}



	/*
@@ -784,7 +784,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, 
		break;

	}



	return_VALUE(ACPI_INTERRUPT_HANDLED);

	return_UINT32(ACPI_INTERRUPT_HANDLED);

}



#endif				/* !ACPI_REDUCED_HARDWARE */

drivers/acpi/acpica/evsci.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context) 
	 */

	interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);



	return_VALUE(interrupt_handled);

	return_UINT32(interrupt_handled);

}



/*******************************************************************************
@@ -120,7 +120,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context) 


	interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);



	return_VALUE(interrupt_handled);

	return_UINT32(interrupt_handled);

}



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

drivers/acpi/acpica/exprep.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc, 
		/* Invalid field access type */



		ACPI_ERROR((AE_INFO, "Unknown field access type 0x%X", access));

		return_VALUE(0);

		return_UINT32(0);

	}



	if (obj_desc->common.type == ACPI_TYPE_BUFFER_FIELD) {
@@ -289,7 +289,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc, 
	}



	*return_byte_alignment = byte_alignment;

	return_VALUE(bit_length);

	return_UINT32(bit_length);

}



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

drivers/acpi/acpica/exutils.c

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base) 
	/* u64 is unsigned, so we don't worry about a '-' prefix */



	if (value == 0) {

		return_VALUE(1);

		return_UINT32(1);

	}



	current_value = value;
@@ -354,7 +354,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base) 
		num_digits++;

	}



	return_VALUE(num_digits);

	return_UINT32(num_digits);

}



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