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

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

ACPICA: Remove obsolete Flags parameter. 



Remove flags parameter for acpi_{get,set}_register().
It is no longer necessary now that these functions use a
spinlock for mutual exclusion.

Signed-off-by: default avatarAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 73ca0fbc

drivers/acpi/events/evevent.c

+3 −5
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ 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_MTX_LOCK);

					      enable_register_id, 0);

			if (ACPI_FAILURE(status)) {

				return (status);

			}
@@ -291,7 +290,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event) 
	/* Clear the status bit */



	(void)acpi_set_register(acpi_gbl_fixed_event_info[event].

				status_register_id, 1, ACPI_MTX_DO_NOT_LOCK);

				status_register_id, 1);



	/*

	 * Make sure we've got a handler.  If not, report an error.
@@ -299,8 +298,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event) 
	 */

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

		(void)acpi_set_register(acpi_gbl_fixed_event_info[event].

					enable_register_id, 0,

					ACPI_MTX_DO_NOT_LOCK);

					enable_register_id, 0);



		ACPI_ERROR((AE_INFO,

			    "No installed handler for fixed event [%08X]",

drivers/acpi/events/evmisc.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ acpi_status acpi_ev_release_global_lock(void) 
		if (pending) {

			status =

			    acpi_set_register(ACPI_BITREG_GLOBAL_LOCK_RELEASE,

					      1, ACPI_MTX_LOCK);

					      1);

		}



		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,

drivers/acpi/events/evxfevnt.c

+6 −6
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags) 
	 */

	status =

	    acpi_set_register(acpi_gbl_fixed_event_info[event].

			      enable_register_id, 1, ACPI_MTX_LOCK);

			      enable_register_id, 1);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}
@@ -166,7 +166,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags) 


	status =

	    acpi_get_register(acpi_gbl_fixed_event_info[event].

			      enable_register_id, &value, ACPI_MTX_LOCK);

			      enable_register_id, &value);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}
@@ -356,14 +356,14 @@ acpi_status acpi_disable_event(u32 event, u32 flags) 
	 */

	status =

	    acpi_set_register(acpi_gbl_fixed_event_info[event].

			      enable_register_id, 0, ACPI_MTX_LOCK);

			      enable_register_id, 0);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	status =

	    acpi_get_register(acpi_gbl_fixed_event_info[event].

			      enable_register_id, &value, ACPI_MTX_LOCK);

			      enable_register_id, &value);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}
@@ -409,7 +409,7 @@ acpi_status acpi_clear_event(u32 event) 
	 */

	status =

	    acpi_set_register(acpi_gbl_fixed_event_info[event].

			      status_register_id, 1, ACPI_MTX_LOCK);

			      status_register_id, 1);



	return_ACPI_STATUS(status);

}
@@ -498,7 +498,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status) 


	status =

	    acpi_get_register(acpi_gbl_fixed_event_info[event].

			      status_register_id, event_status, ACPI_MTX_LOCK);

			      status_register_id, event_status);



	return_ACPI_STATUS(status);

}

drivers/acpi/hardware/hwacpi.c

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

	}



	status =

	    acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value, ACPI_MTX_LOCK);

	status = acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value);

	if (ACPI_FAILURE(status)) {

		return_UINT32(ACPI_SYS_MODE_LEGACY);

	}

drivers/acpi/hardware/hwregs.c

+5 −13
Original line number Diff line number Diff line
@@ -54,17 +54,15 @@ ACPI_MODULE_NAME("hwregs") 
 *

 * FUNCTION:    acpi_hw_clear_acpi_status

 *

 * PARAMETERS:  Flags           - Lock the hardware or not

 * PARAMETERS:  None

 *

 * RETURN:      none

 * RETURN:      None

 *

 * DESCRIPTION: Clears all fixed and general purpose status bits

 *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED

 *

 * NOTE: TBD: Flags parameter is obsolete, to be removed

 *

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

acpi_status acpi_hw_clear_acpi_status(u32 flags)

acpi_status acpi_hw_clear_acpi_status(void)

{

	acpi_status status;

	acpi_cpu_flags lock_flags = 0;
@@ -253,18 +251,15 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id) 
 *

 * PARAMETERS:  register_id     - ID of ACPI bit_register to access

 *              return_value    - Value that was read from the register

 *              Flags           - Lock the hardware or not

 *

 * RETURN:      Status and the value read from specified Register. Value

 *              returned is normalized to bit0 (is shifted all the way right)

 *

 * DESCRIPTION: ACPI bit_register read function.

 *

 * NOTE: TBD: Flags parameter is obsolete, to be removed

 *

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



acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)

acpi_status acpi_get_register(u32 register_id, u32 * return_value)

{

	u32 register_value = 0;

	struct acpi_bit_register_info *bit_reg_info;
@@ -312,16 +307,13 @@ ACPI_EXPORT_SYMBOL(acpi_get_register) 
 * PARAMETERS:  register_id     - ID of ACPI bit_register to access

 *              Value           - (only used on write) value to write to the

 *                                Register, NOT pre-normalized to the bit pos

 *              Flags           - Lock the hardware or not

 *

 * RETURN:      Status

 *

 * DESCRIPTION: ACPI Bit Register write function.

 *

 * NOTE: TBD: Flags parameter is obsolete, to be removed

 *

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

acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)

acpi_status acpi_set_register(u32 register_id, u32 value)

{

	u32 register_value = 0;

	struct acpi_bit_register_info *bit_reg_info;