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

Commit 546eb576 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

ACPICA: Drop acpi_set_gpe 



The acpi_set_gpe() function is a little awkward, because it doesn't
really work as advertised in the "disable" case.  Namely, if a GPE
has been enabled with acpi_enable_gpe() and triggered a notification
to occur, and if acpi_set_gpe() is used to disable it before
acpi_ev_asynch_enable_gpe() runs, the GPE will be immediately enabled
by the latter as though the acpi_set_gpe() had no effect.

Thus, since it's been possible to make all of its callers use
alternative operations to disable or enable GPEs, acpi_set_gpe() can
be dropped.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3bd741bd

drivers/acpi/acpica/evxfevnt.c

+0 −60
Original line number Diff line number Diff line
@@ -208,66 +208,6 @@ acpi_status acpi_enable_event(u32 event, u32 flags) 


ACPI_EXPORT_SYMBOL(acpi_enable_event)



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

 *

 * FUNCTION:    acpi_set_gpe

 *

 * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1

 *              gpe_number      - GPE level within the GPE block

 *              action          - ACPI_GPE_ENABLE or ACPI_GPE_DISABLE

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Enable or disable an individual GPE. This function bypasses

 *              the reference count mechanism used in the acpi_enable_gpe and

 *              acpi_disable_gpe interfaces -- and should be used with care.

 *

 * Note: Typically used to disable a runtime GPE for short period of time,

 * then re-enable it, without disturbing the existing reference counts. This

 * is useful, for example, in the Embedded Controller (EC) driver.

 *

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

acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)

{

	struct acpi_gpe_event_info *gpe_event_info;

	acpi_status status;

	acpi_cpu_flags flags;



	ACPI_FUNCTION_TRACE(acpi_set_gpe);



	flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);



	/* Ensure that we have a valid GPE number */



	gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);

	if (!gpe_event_info) {

		status = AE_BAD_PARAMETER;

		goto unlock_and_exit;

	}



	/* Perform the action */



	switch (action) {

	case ACPI_GPE_ENABLE:

		status = acpi_ev_enable_gpe(gpe_event_info);

		break;



	case ACPI_GPE_DISABLE:

		status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);

		break;



	default:

		status = AE_BAD_PARAMETER;

		break;

	}



      unlock_and_exit:

	acpi_os_release_lock(acpi_gbl_gpe_lock, flags);

	return_ACPI_STATUS(status);

}



ACPI_EXPORT_SYMBOL(acpi_set_gpe)



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

 *

 * FUNCTION:    acpi_gpe_wakeup

include/acpi/acpixf.h

+0 −2
Original line number Diff line number Diff line
@@ -282,8 +282,6 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status); 
/*

 * GPE Interfaces

 */

acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action);



acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);



acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);

include/acpi/actypes.h

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ typedef u32 acpi_event_status; 
#define ACPI_GPE_MAX                    0xFF

#define ACPI_NUM_GPE                    256



/* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */

/* Actions for acpi_gpe_wakeup, acpi_hw_low_set_gpe */



#define ACPI_GPE_ENABLE                 0

#define ACPI_GPE_DISABLE                1