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

Commit 2f857234 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Events: Reduce source code difference for the ACPI_EVENT_FLAG_HANDLE renaming. 

This patch is partial linuxized result of the following ACPICA commit:
  ACPICA commit: a73b66c6aa1846d055bb6390d9c9b9902f7d804d
  Subject: Add "has handler" flag to event/gpe status interfaces.
  This change adds a new flag, ACPI_EVENT_FLAGS_HAS_HANDLER to the
  acpi_get_event_status and acpi_get_gpe_status external interfaces. It
  is set if the event/gpe currently has a handler associated with it.
This patch contains the code to rename ACPI_EVENT_FLAG_HANDLE to
ACPI_EVENT_FLAG_HAS_HANDLER, and the corresponding updates of its usages.

Link: https://github.com/acpica/acpica/commit/a73b66c6


Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a08f813e

drivers/acpi/acpica/evxfevnt.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status) 
	/* Fixed event currently can be dispatched? */



	if (acpi_gbl_fixed_event_handlers[event].handler) {

		local_event_status |= ACPI_EVENT_FLAG_HANDLE;

		local_event_status |= ACPI_EVENT_FLAG_HAS_HANDLER;

	}



	/* Fixed event currently enabled? */

drivers/acpi/acpica/hwgpe.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info, 


	if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) !=

	    ACPI_GPE_DISPATCH_NONE) {

		local_event_status |= ACPI_EVENT_FLAG_HANDLE;

		local_event_status |= ACPI_EVENT_FLAG_HAS_HANDLER;

	}



	/* Get the info block for the entire GPE register */

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1470,7 +1470,7 @@ static void acpi_wakeup_gpe_init(struct acpi_device *device) 
	if (ACPI_FAILURE(status))

		return;



	wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HANDLE);

	wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HAS_HANDLER);

}



static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)

drivers/acpi/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static ssize_t counter_show(struct kobject *kobj, 
	if (result)

		goto end;



	if (!(status & ACPI_EVENT_FLAG_HANDLE))

	if (!(status & ACPI_EVENT_FLAG_HAS_HANDLER))

		size += sprintf(buf + size, "   invalid");

	else if (status & ACPI_EVENT_FLAG_ENABLED)

		size += sprintf(buf + size, "   enabled");
@@ -581,7 +581,7 @@ static ssize_t counter_set(struct kobject *kobj, 
	if (result)

		goto end;



	if (!(status & ACPI_EVENT_FLAG_HANDLE)) {

	if (!(status & ACPI_EVENT_FLAG_HAS_HANDLER)) {

		printk(KERN_WARNING PREFIX

		       "Can not change Invalid GPE/Fixed Event status\n");

		return -EINVAL;

include/acpi/actypes.h

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ typedef u32 acpi_event_status; 
#define ACPI_EVENT_FLAG_ENABLED         (acpi_event_status) 0x01

#define ACPI_EVENT_FLAG_WAKE_ENABLED    (acpi_event_status) 0x02

#define ACPI_EVENT_FLAG_SET             (acpi_event_status) 0x04

#define ACPI_EVENT_FLAG_HANDLE          (acpi_event_status) 0x08

#define ACPI_EVENT_FLAG_HAS_HANDLER     (acpi_event_status) 0x08



/* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */