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

Commit 50ffba1b authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Rename ACPI bit register access functions 



Rename acpi_get_register and acpi_set_register to clarify the
purpose of these functions. New names are acpi_read_bit_register
and acpi_write_bit_register.

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 9892dd23

drivers/acpi/acpica/evevent.c

+6 −6
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ static acpi_status acpi_ev_fixed_event_initialize(void) 


		if (acpi_gbl_fixed_event_info[i].enable_register_id != 0xFF) {

			status =

			    acpi_set_register(acpi_gbl_fixed_event_info[i].

					      enable_register_id, 0);

			    acpi_write_bit_register(acpi_gbl_fixed_event_info

						    [i].enable_register_id, 0);

			if (ACPI_FAILURE(status)) {

				return (status);

			}
@@ -288,7 +288,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event) 


	/* Clear the status bit */



	(void)acpi_set_register(acpi_gbl_fixed_event_info[event].

	(void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].

				      status_register_id, 1);



	/*
@@ -296,7 +296,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event) 
	 * disabled to prevent further interrupts.

	 */

	if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {

		(void)acpi_set_register(acpi_gbl_fixed_event_info[event].

		(void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].

					      enable_register_id, 0);



		ACPI_ERROR((AE_INFO,

drivers/acpi/acpica/evmisc.c

+2 −2
Original line number Diff line number Diff line
@@ -534,8 +534,8 @@ acpi_status acpi_ev_release_global_lock(void) 
		 */

		if (pending) {

			status =

			    acpi_set_register(ACPI_BITREG_GLOBAL_LOCK_RELEASE,

					      1);

			    acpi_write_bit_register

			    (ACPI_BITREG_GLOBAL_LOCK_RELEASE, 1);

		}



		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,

drivers/acpi/acpica/evxfevnt.c

+12 −12
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags) 
	 * register bit)

	 */

	status =

	    acpi_set_register(acpi_gbl_fixed_event_info[event].

	    acpi_write_bit_register(acpi_gbl_fixed_event_info[event].

				    enable_register_id, 1);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);
@@ -181,7 +181,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags) 
	/* Make sure that the hardware responded */



	status =

	    acpi_get_register(acpi_gbl_fixed_event_info[event].

	    acpi_read_bit_register(acpi_gbl_fixed_event_info[event].

				   enable_register_id, &value);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);
@@ -354,14 +354,14 @@ acpi_status acpi_disable_event(u32 event, u32 flags) 
	 * register bit)

	 */

	status =

	    acpi_set_register(acpi_gbl_fixed_event_info[event].

	    acpi_write_bit_register(acpi_gbl_fixed_event_info[event].

				    enable_register_id, 0);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	status =

	    acpi_get_register(acpi_gbl_fixed_event_info[event].

	    acpi_read_bit_register(acpi_gbl_fixed_event_info[event].

				   enable_register_id, &value);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);
@@ -407,7 +407,7 @@ acpi_status acpi_clear_event(u32 event) 
	 * register bit)

	 */

	status =

	    acpi_set_register(acpi_gbl_fixed_event_info[event].

	    acpi_write_bit_register(acpi_gbl_fixed_event_info[event].

				    status_register_id, 1);



	return_ACPI_STATUS(status);
@@ -495,7 +495,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status) 
	/* Get the status of the requested fixed event */



	status =

	    acpi_get_register(acpi_gbl_fixed_event_info[event].

	    acpi_read_bit_register(acpi_gbl_fixed_event_info[event].

			      enable_register_id, &value);

	if (ACPI_FAILURE(status))

		return_ACPI_STATUS(status);
@@ -503,7 +503,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status) 
	*event_status = value;



	status =

	    acpi_get_register(acpi_gbl_fixed_event_info[event].

	    acpi_read_bit_register(acpi_gbl_fixed_event_info[event].

			      status_register_id, &value);

	if (ACPI_FAILURE(status))

		return_ACPI_STATUS(status);

drivers/acpi/acpica/hwacpi.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ u32 acpi_hw_get_mode(void) 
		return_UINT32(ACPI_SYS_MODE_ACPI);

	}



	status = acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value);

	status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);

	if (ACPI_FAILURE(status)) {

		return_UINT32(ACPI_SYS_MODE_LEGACY);

	}

drivers/acpi/acpica/hwsleep.c

+8 −7
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) 


	/* Clear wake status */



	status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);

	status = acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}
@@ -365,7 +365,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) 
	/* Wait until we enter sleep state */



	do {

		status = acpi_get_register(ACPI_BITREG_WAKE_STATUS,

		status = acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS,

						    &in_value);

		if (ACPI_FAILURE(status)) {

			return_ACPI_STATUS(status);
@@ -399,7 +399,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void) 


	ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);



	status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);

	status = acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}
@@ -431,7 +431,8 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void) 


	do {

		acpi_os_stall(1000);

		status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value);

		status =

		    acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS, &in_value);

		if (ACPI_FAILURE(status)) {

			return_ACPI_STATUS(status);

		}
@@ -592,18 +593,18 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state) 
	 * it to determine whether the system is rebooting or resuming. Clear

	 * it for compatibility.

	 */

	acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);

	acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);



	acpi_gbl_system_awake_and_running = TRUE;



	/* Enable power button */



	(void)

	    acpi_set_register(acpi_gbl_fixed_event_info

	    acpi_write_bit_register(acpi_gbl_fixed_event_info

			      [ACPI_EVENT_POWER_BUTTON].enable_register_id, 1);



	(void)

	    acpi_set_register(acpi_gbl_fixed_event_info

	    acpi_write_bit_register(acpi_gbl_fixed_event_info

			      [ACPI_EVENT_POWER_BUTTON].status_register_id, 1);



	arg.integer.value = ACPI_SST_WORKING;