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

Commit 4efeeecd authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Clarify METHOD_NAME* defines for full-pathname cases 



Changed the METHOD_NAME* defines that define a full pathname to
the method to METHOD_PATHNAME* in order to make it clear that
it is not a simple 4-character ACPI name. Used for the various
sleep/wake methods.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent dd0228e9

drivers/acpi/acpica/hwesleep.c

+11 −11
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".); 
 *

 * FUNCTION:    acpi_hw_execute_sleep_method

 *

 * PARAMETERS:  method_name         - Pathname of method to execute

 * PARAMETERS:  method_pathname     - Pathname of method to execute

 *              integer_argument    - Argument to pass to the method

 *

 * RETURN:      None
@@ -68,7 +68,7 @@ MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".); 
 *              and no return value.

 *

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

void acpi_hw_execute_sleep_method(char *method_name, u32 integer_argument)

void acpi_hw_execute_sleep_method(char *method_pathname, u32 integer_argument)

{

	struct acpi_object_list arg_list;

	union acpi_object arg;
@@ -76,10 +76,10 @@ void acpi_hw_execute_sleep_method(char *method_name, u32 integer_argument) 


	ACPI_FUNCTION_TRACE(hw_execute_sleep_method);



	if (!ACPI_STRCMP(METHOD_NAME__GTS, method_name) && !gts)

	if (!ACPI_STRCMP(METHOD_PATHNAME__GTS, method_pathname) && !gts)

		return_VOID;



	if (!ACPI_STRCMP(METHOD_NAME__BFS, method_name) && !bfs)

	if (!ACPI_STRCMP(METHOD_PATHNAME__BFS, method_pathname) && !bfs)

		return_VOID;



	/* One argument, integer_argument; No return value expected */
@@ -89,10 +89,10 @@ void acpi_hw_execute_sleep_method(char *method_name, u32 integer_argument) 
	arg.type = ACPI_TYPE_INTEGER;

	arg.integer.value = (u64)integer_argument;



	status = acpi_evaluate_object(NULL, method_name, &arg_list, NULL);

	status = acpi_evaluate_object(NULL, method_pathname, &arg_list, NULL);

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {

		ACPI_EXCEPTION((AE_INFO, status, "While executing method %s",

				method_name));

				method_pathname));

	}



	return_VOID;
@@ -138,7 +138,7 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state) 


	/* Execute the _GTS method (Going To Sleep) */



	acpi_hw_execute_sleep_method(METHOD_NAME__GTS, sleep_state);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__GTS, sleep_state);



	/* Flush caches, as per ACPI specification */
@@ -208,7 +208,7 @@ acpi_status acpi_hw_extended_wake_prep(u8 sleep_state) 
				 &acpi_gbl_FADT.sleep_control);

	}



	acpi_hw_execute_sleep_method(METHOD_NAME__BFS, sleep_state);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__BFS, sleep_state);

	return_ACPI_STATUS(AE_OK);

}
@@ -235,8 +235,8 @@ acpi_status acpi_hw_extended_wake(u8 sleep_state) 


	/* Execute the wake methods */



	acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WAKING);

	acpi_hw_execute_sleep_method(METHOD_NAME__WAK, sleep_state);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WAKING);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__WAK, sleep_state);



	/*

	 * Some BIOS code assumes that WAK_STS will be cleared on resume
@@ -246,6 +246,6 @@ acpi_status acpi_hw_extended_wake(u8 sleep_state) 
	(void)acpi_write(ACPI_X_WAKE_STATUS, &acpi_gbl_FADT.sleep_status);

	acpi_gbl_system_awake_and_running = TRUE;



	acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WORKING);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);

	return_ACPI_STATUS(AE_OK);

}

drivers/acpi/acpica/hwsleep.c

+5 −5
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state) 


	/* Execute the _GTS method (Going To Sleep) */



	acpi_hw_execute_sleep_method(METHOD_NAME__GTS, sleep_state);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__GTS, sleep_state);



	/* Get current value of PM1A control */
@@ -279,7 +279,7 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state) 
		}

	}



	acpi_hw_execute_sleep_method(METHOD_NAME__BFS, sleep_state);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__BFS, sleep_state);

	return_ACPI_STATUS(status);

}
@@ -305,7 +305,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) 
	/* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */



	acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID;

	acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WAKING);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WAKING);



	/*

	 * GPEs must be enabled before _WAK is called as GPEs
@@ -329,7 +329,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) 
	 * Now we can execute _WAK, etc. Some machines require that the GPEs

	 * are enabled before the wake methods are executed.

	 */

	acpi_hw_execute_sleep_method(METHOD_NAME__WAK, sleep_state);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__WAK, sleep_state);



	/*

	 * Some BIOS code assumes that WAK_STS will be cleared on resume
@@ -361,7 +361,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) 
		return_ACPI_STATUS(status);

	}



	acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WORKING);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);

	return_ACPI_STATUS(status);

}

drivers/acpi/acpica/hwxfsleep.c

+3 −2
Original line number Diff line number Diff line
@@ -306,7 +306,8 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) 
	arg.type = ACPI_TYPE_INTEGER;

	arg.integer.value = sleep_state;



	status = acpi_evaluate_object(NULL, METHOD_NAME__PTS, &arg_list, NULL);

	status =

	    acpi_evaluate_object(NULL, METHOD_PATHNAME__PTS, &arg_list, NULL);

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {

		return_ACPI_STATUS(status);

	}
@@ -337,7 +338,7 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) 
	 * Set the system indicators to show the desired sleep state.

	 * _SST is an optional method (return no error if not found)

	 */

	acpi_hw_execute_sleep_method(METHOD_NAME__SST, sst_value);

	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, sst_value);

	return_ACPI_STATUS(AE_OK);

}

drivers/acpi/acpica/nsdumpdv.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void acpi_ns_dump_root_devices(void) 
		return;

	}



	status = acpi_get_handle(NULL, ACPI_NS_SYSTEM_BUS, &sys_bus_handle);

	status = acpi_get_handle(NULL, METHOD_NAME__SB_, &sys_bus_handle);

	if (ACPI_FAILURE(status)) {

		return;

	}

drivers/acpi/sleep.c

+2 −2
Original line number Diff line number Diff line
@@ -788,13 +788,13 @@ static void __init acpi_gts_bfs_check(void) 
{

	acpi_handle dummy;



	if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__GTS, &dummy)))

	if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_PATHNAME__GTS, &dummy)))

	{

		printk(KERN_NOTICE PREFIX "BIOS offers _GTS\n");

		printk(KERN_NOTICE PREFIX "If \"acpi.gts=1\" improves suspend, "

			"please notify linux-acpi@vger.kernel.org\n");

	}

	if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__BFS, &dummy)))

	if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_PATHNAME__BFS, &dummy)))

	{

		printk(KERN_NOTICE PREFIX "BIOS offers _BFS\n");

		printk(KERN_NOTICE PREFIX "If \"acpi.bfs=1\" improves resume, "