5 files changed, 6 insertions, 6 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)
         /* 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? */
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,
 
         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 */
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)
         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)
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,
         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;
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 857830d8989b..7000e66f768e 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -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 */