diff options
author | Lv Zheng <lv.zheng@intel.com> | 2014-10-09 22:40:05 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-20 18:39:40 -0400 |
commit | 2f8572344e65296d13c1a771cacfea60916d91dc (patch) | |
tree | 5794a48fb6f2ede1a695acf264363d3fd80045e6 /drivers | |
parent | a08f813e58169a8edd01e13d73f60d8561f3ecea (diff) |
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: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/acpica/evxfevnt.c | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/hwgpe.c | 2 | ||||
-rw-r--r-- | drivers/acpi/scan.c | 2 | ||||
-rw-r--r-- | drivers/acpi/sysfs.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c index a8a077c97187..bb8cbf5961bf 100644 --- a/drivers/acpi/acpica/evxfevnt.c +++ b/drivers/acpi/acpica/evxfevnt.c | |||
@@ -343,7 +343,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status) | |||
343 | /* Fixed event currently can be dispatched? */ | 343 | /* Fixed event currently can be dispatched? */ |
344 | 344 | ||
345 | if (acpi_gbl_fixed_event_handlers[event].handler) { | 345 | if (acpi_gbl_fixed_event_handlers[event].handler) { |
346 | local_event_status |= ACPI_EVENT_FLAG_HANDLE; | 346 | local_event_status |= ACPI_EVENT_FLAG_HAS_HANDLER; |
347 | } | 347 | } |
348 | 348 | ||
349 | /* Fixed event currently enabled? */ | 349 | /* Fixed event currently enabled? */ |
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c index 0302bc36287b..48ac7b7b59cd 100644 --- a/drivers/acpi/acpica/hwgpe.c +++ b/drivers/acpi/acpica/hwgpe.c | |||
@@ -220,7 +220,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info, | |||
220 | 220 | ||
221 | if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) != | 221 | if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) != |
222 | ACPI_GPE_DISPATCH_NONE) { | 222 | ACPI_GPE_DISPATCH_NONE) { |
223 | local_event_status |= ACPI_EVENT_FLAG_HANDLE; | 223 | local_event_status |= ACPI_EVENT_FLAG_HAS_HANDLER; |
224 | } | 224 | } |
225 | 225 | ||
226 | /* Get the info block for the entire GPE register */ | 226 | /* Get the info block for the entire GPE register */ |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index ae44d8654c82..f1d96e7519cb 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1470,7 +1470,7 @@ static void acpi_wakeup_gpe_init(struct acpi_device *device) | |||
1470 | if (ACPI_FAILURE(status)) | 1470 | if (ACPI_FAILURE(status)) |
1471 | return; | 1471 | return; |
1472 | 1472 | ||
1473 | wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HANDLE); | 1473 | wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HAS_HANDLER); |
1474 | } | 1474 | } |
1475 | 1475 | ||
1476 | static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device) | 1476 | static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device) |
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index 38cb9782d4b8..13e577c80201 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c | |||
@@ -537,7 +537,7 @@ static ssize_t counter_show(struct kobject *kobj, | |||
537 | if (result) | 537 | if (result) |
538 | goto end; | 538 | goto end; |
539 | 539 | ||
540 | if (!(status & ACPI_EVENT_FLAG_HANDLE)) | 540 | if (!(status & ACPI_EVENT_FLAG_HAS_HANDLER)) |
541 | size += sprintf(buf + size, " invalid"); | 541 | size += sprintf(buf + size, " invalid"); |
542 | else if (status & ACPI_EVENT_FLAG_ENABLED) | 542 | else if (status & ACPI_EVENT_FLAG_ENABLED) |
543 | size += sprintf(buf + size, " enabled"); | 543 | size += sprintf(buf + size, " enabled"); |
@@ -581,7 +581,7 @@ static ssize_t counter_set(struct kobject *kobj, | |||
581 | if (result) | 581 | if (result) |
582 | goto end; | 582 | goto end; |
583 | 583 | ||
584 | if (!(status & ACPI_EVENT_FLAG_HANDLE)) { | 584 | if (!(status & ACPI_EVENT_FLAG_HAS_HANDLER)) { |
585 | printk(KERN_WARNING PREFIX | 585 | printk(KERN_WARNING PREFIX |
586 | "Can not change Invalid GPE/Fixed Event status\n"); | 586 | "Can not change Invalid GPE/Fixed Event status\n"); |
587 | return -EINVAL; | 587 | return -EINVAL; |