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

Commit 6921de89 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPICA: Return u32 from acpi_dispatch_gpe() 



In some cases it is useful to know whether or not the
acpi_ev_detect_gpe() called by acpi_dispatch_gpe() has found
the GPE to be active, so return the return value of it (whose
data type is u32) from latter.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3a79bc63

drivers/acpi/acpica/evxfgpe.c

+3 −3
Original line number Diff line number Diff line
@@ -644,17 +644,17 @@ ACPI_EXPORT_SYMBOL(acpi_get_gpe_status) 
 * PARAMETERS:  gpe_device          - Parent GPE Device. NULL for GPE0/GPE1

 *              gpe_number          - GPE level within the GPE block

 *

 * RETURN:      None

 * RETURN:      INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED

 *

 * DESCRIPTION: Detect and dispatch a General Purpose Event to either a function

 *              (e.g. EC) or method (e.g. _Lxx/_Exx) handler.

 *

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

void acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number)

u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number)

{

	ACPI_FUNCTION_TRACE(acpi_dispatch_gpe);



	acpi_ev_detect_gpe(gpe_device, NULL, gpe_number);

	return acpi_ev_detect_gpe(gpe_device, NULL, gpe_number);

}



ACPI_EXPORT_SYMBOL(acpi_dispatch_gpe)

include/acpi/acpixf.h

+7 −1
Original line number Diff line number Diff line
@@ -297,6 +297,9 @@ ACPI_GLOBAL(u8, acpi_gbl_system_awake_and_running); 
#define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \

	ACPI_EXTERNAL_RETURN_OK(prototype)



#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \

	ACPI_EXTERNAL_RETURN_UINT32(prototype)



#define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \

	ACPI_EXTERNAL_RETURN_VOID(prototype)
@@ -307,6 +310,9 @@ ACPI_GLOBAL(u8, acpi_gbl_system_awake_and_running); 
#define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \

	static ACPI_INLINE prototype {return(AE_OK);}



#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \

	static ACPI_INLINE prototype {return(0);}



#define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \

	static ACPI_INLINE prototype {return;}
@@ -738,7 +744,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
						     u32 gpe_number,

						     acpi_event_status

						     *event_status))

ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))

ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))