ACPICA: Remove wakeup GPE reference counting which is not used

After the previous patch that introduced acpi_gpe_wakeup() and
modified the ACPI suspend and wakeup code to use it, the third
argument of acpi_{enable|disable}_gpe() and the GPE wakeup
reference counter are not necessary any more.  Remove them and
modify all of the users of acpi_{enable|disable}_gpe()
accordingly.  Also drop GPE type constants that aren't used
any more.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index c3f43daa8be3b84fa33e411f8240fd4e47c87ba5..a561944fbaf9fbb6e1d59816c16ca0b11dd143a5 100644 (file)
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -78,7 +78,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node *node,
 u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
 
 acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
+acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info);
 
 struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                                                       u32 gpe_number);

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index eb2d420b39ec13169095cb292cb082074fdca82e..1ee0bcf399aaf8fd9c0e24054a08bcd282187fd5 100644 (file)
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -429,7 +429,6 @@ struct acpi_gpe_event_info {
        u8 flags;               /* Misc info about this GPE */
        u8 gpe_number;          /* This GPE */
        u8 runtime_count;       /* References to a run GPE */
-       u8 wakeup_count;        /* References to a wake GPE */
 };
 
 /* Information about a GPE register pair, one per each status/enable pair in an array */

diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index d24d7d31f40ce6ba85c2c1eaaf87f489143a189a..9413ac61e440c2f2f76bedc583652edeec013130 100644 (file)
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -54,24 +54,24 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context);
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ev_update_gpe_enable_masks
+ * FUNCTION:    acpi_ev_update_gpe_enable_mask
  *
  * PARAMETERS:  gpe_event_info          - GPE to update
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Updates GPE register enable masks based upon whether there are
- *              references (either wake or run) to this GPE
+ * DESCRIPTION: Updates GPE register enable mask based upon whether there are
+ *              runtime references to this GPE
  *
  ******************************************************************************/
 
 acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
+acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
 {
        struct acpi_gpe_register_info *gpe_register_info;
        u32 register_bit;
 
-       ACPI_FUNCTION_TRACE(ev_update_gpe_enable_masks);
+       ACPI_FUNCTION_TRACE(ev_update_gpe_enable_mask);
 
        gpe_register_info = gpe_event_info->register_info;
        if (!gpe_register_info) {
@@ -81,19 +81,14 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
                                                gpe_register_info);
 
-       /* Clear the wake/run bits up front */
+       /* Clear the run bit up front */
 
-       ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
        ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
 
-       /* Set the mask bits only if there are references to this GPE */
+       /* Set the mask bit only if there are references to this GPE */
 
        if (gpe_event_info->runtime_count) {
-               ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
-       }
-
-       if (gpe_event_info->wakeup_count) {
-               ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
+               ACPI_SET_BIT(gpe_register_info->enable_for_run, (u8)register_bit);
        }
 
        return_ACPI_STATUS(AE_OK);

diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 341a38ce8aa6ce34e2e5a6c8653d6067ba9921d9..77e8630043f8688cb8c4b5373485f0955a3a6c36 100644 (file)
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -529,8 +529,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
 
                        /* Enable this GPE */
 
-                       status = acpi_enable_gpe(gpe_device, gpe_number,
-                                                ACPI_GPE_TYPE_RUNTIME);
+                       status = acpi_enable_gpe(gpe_device, gpe_number);
                        if (ACPI_FAILURE(status)) {
                                ACPI_EXCEPTION((AE_INFO, status,
                                                "Could not enable GPE 0x%02X",

diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index 3f6c2d26410dfc21926acdde5be9c92408881ae1..8db9e076a53b87cf75e0ac7aed5ac02524f4370f 100644 (file)
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -482,8 +482,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
                                gpe_device = NULL;
                        }
 
-                       status = acpi_enable_gpe(gpe_device, gpe_number,
-                                                ACPI_GPE_TYPE_RUNTIME);
+                       status = acpi_enable_gpe(gpe_device, gpe_number);
                        if (ACPI_FAILURE(status)) {
                                ACPI_EXCEPTION((AE_INFO, status,
                                                "Could not enable GPE 0x%02X",

diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index d6a6d4a765926dff17da0b255bc3a9d4a49e7ae9..467fde961aefe164c748d2e37d48c474571391cb 100644 (file)
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -352,12 +352,13 @@ acpi_status acpi_gpe_wakeup(acpi_handle gpe_device, u32 gpe_number, u8 action)
 
        switch (action) {
        case ACPI_GPE_ENABLE:
-               ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
+               ACPI_SET_BIT(gpe_register_info->enable_for_wake,
+                            (u8)register_bit);
                break;
 
        case ACPI_GPE_DISABLE:
                ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
-                              register_bit);
+                              (u8)register_bit);
                break;
 
        default:
@@ -379,17 +380,14 @@ ACPI_EXPORT_SYMBOL(acpi_gpe_wakeup)
  *
  * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              gpe_type        - ACPI_GPE_TYPE_RUNTIME or ACPI_GPE_TYPE_WAKE
- *                                or both
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Add a reference to a GPE. On the first reference, the GPE is
- *              hardware-enabled (for runtime GPEs), or the GPE register mask
- *              is updated (for wake GPEs).
+ *              hardware-enabled.
  *
  ******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
 {
        acpi_status status = AE_OK;
        struct acpi_gpe_event_info *gpe_event_info;
@@ -397,12 +395,6 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type)
 
        ACPI_FUNCTION_TRACE(acpi_enable_gpe);
 
-       /* Parameter validation */
-
-       if (!gpe_type || (gpe_type & ~ACPI_GPE_TYPE_WAKE_RUN)) {
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
-       }
-
        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
        /* Ensure that we have a valid GPE number */
@@ -413,46 +405,19 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type)
                goto unlock_and_exit;
        }
 
-       if (gpe_type & ACPI_GPE_TYPE_RUNTIME) {
-               if (gpe_event_info->runtime_count == ACPI_UINT8_MAX) {
-                       status = AE_LIMIT;      /* Too many references */
-                       goto unlock_and_exit;
-               }
-
-               gpe_event_info->runtime_count++;
-               if (gpe_event_info->runtime_count == 1) {
-                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
-                       if (ACPI_SUCCESS(status)) {
-                               status = acpi_clear_and_enable_gpe(gpe_event_info);
-                       }
-
-                       if (ACPI_FAILURE(status)) {
-                               gpe_event_info->runtime_count--;
-                               goto unlock_and_exit;
-                       }
-               }
+       if (gpe_event_info->runtime_count == ACPI_UINT8_MAX) {
+               status = AE_LIMIT;      /* Too many references */
+               goto unlock_and_exit;
        }
 
-       if (gpe_type & ACPI_GPE_TYPE_WAKE) {
-               /* The GPE must have the ability to wake the system */
-
-               if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
-                       status = AE_TYPE;
-                       goto unlock_and_exit;
-               }
-
-               if (gpe_event_info->wakeup_count == ACPI_UINT8_MAX) {
-                       status = AE_LIMIT;      /* Too many references */
-                       goto unlock_and_exit;
+       gpe_event_info->runtime_count++;
+       if (gpe_event_info->runtime_count == 1) {
+               status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
+               if (ACPI_SUCCESS(status)) {
+                       status = acpi_clear_and_enable_gpe(gpe_event_info);
                }
-
-               /*
-                * Update the enable mask on the first wakeup reference. Wake GPEs
-                * are only hardware-enabled just before sleeping.
-                */
-               gpe_event_info->wakeup_count++;
-               if (gpe_event_info->wakeup_count == 1) {
-                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+               if (ACPI_FAILURE(status)) {
+                       gpe_event_info->runtime_count--;
                }
        }
 
@@ -468,8 +433,6 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
  *
  * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
  *              gpe_number      - GPE level within the GPE block
- *              gpe_type        - ACPI_GPE_TYPE_RUNTIME or ACPI_GPE_TYPE_WAKE
- *                                or both
  *
  * RETURN:      Status
  *
@@ -478,7 +441,7 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
  *              the GPE mask bit disabled (for wake GPEs)
  *
  ******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
 {
        acpi_status status = AE_OK;
        struct acpi_gpe_event_info *gpe_event_info;
@@ -486,12 +449,6 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type
 
        ACPI_FUNCTION_TRACE(acpi_disable_gpe);
 
-       /* Parameter validation */
-
-       if (!gpe_type || (gpe_type & ~ACPI_GPE_TYPE_WAKE_RUN)) {
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
-       }
-
        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
        /* Ensure that we have a valid GPE number */
@@ -504,41 +461,21 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type
 
        /* Hardware-disable a runtime GPE on removal of the last reference */
 
-       if (gpe_type & ACPI_GPE_TYPE_RUNTIME) {
-               if (!gpe_event_info->runtime_count) {
-                       status = AE_LIMIT;      /* There are no references to remove */
-                       goto unlock_and_exit;
-               }
-
-               gpe_event_info->runtime_count--;
-               if (!gpe_event_info->runtime_count) {
-                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
-                       if (ACPI_SUCCESS(status)) {
-                               status = acpi_hw_low_set_gpe(gpe_event_info,
-                                                            ACPI_GPE_DISABLE);
-                       }
-
-                       if (ACPI_FAILURE(status)) {
-                               gpe_event_info->runtime_count++;
-                               goto unlock_and_exit;
-                       }
-               }
+       if (!gpe_event_info->runtime_count) {
+               status = AE_LIMIT;      /* There are no references to remove */
+               goto unlock_and_exit;
        }
 
-       /*
-        * Update masks for wake GPE on removal of the last reference.
-        * No need to hardware-disable wake GPEs here, they are not currently
-        * enabled.
-        */
-       if (gpe_type & ACPI_GPE_TYPE_WAKE) {
-               if (!gpe_event_info->wakeup_count) {
-                       status = AE_LIMIT;      /* There are no references to remove */
-                       goto unlock_and_exit;
+       gpe_event_info->runtime_count--;
+       if (!gpe_event_info->runtime_count) {
+               status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
+               if (ACPI_SUCCESS(status)) {
+                       status =
+                           acpi_hw_low_set_gpe(gpe_event_info,
+                                               ACPI_GPE_DISABLE);
                }
-
-               gpe_event_info->wakeup_count--;
-               if (!gpe_event_info->wakeup_count) {
-                       status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+               if (ACPI_FAILURE(status)) {
+                       gpe_event_info->runtime_count++;
                }
        }
 

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 7d857dabdde44ad8085737591be907c49b3fbf4e..1575a9b51f1d9e1dfb0e16efb65bf31f60bcb506 100644 (file)
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -424,8 +424,7 @@ static int acpi_button_add(struct acpi_device *device)
        if (device->wakeup.flags.valid) {
                /* Button's GPE is run-wake GPE */
                acpi_enable_gpe(device->wakeup.gpe_device,
-                               device->wakeup.gpe_number,
-                               ACPI_GPE_TYPE_RUNTIME);
+                               device->wakeup.gpe_number);
                device->wakeup.run_wake_count++;
                device->wakeup.state.enabled = 1;
        }
@@ -448,8 +447,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
 
        if (device->wakeup.flags.valid) {
                acpi_disable_gpe(device->wakeup.gpe_device,
-                               device->wakeup.gpe_number,
-                               ACPI_GPE_TYPE_RUNTIME);
+                               device->wakeup.gpe_number);
                device->wakeup.run_wake_count--;
                device->wakeup.state.enabled = 0;
        }

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5f2027d782e8134642d777225f4c37f6120b214f..bf50454165753f8e45e57bd789855b148689cf46 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -822,7 +822,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
        if (ACPI_FAILURE(status))
                return -ENODEV;
 
-       acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
+       acpi_enable_gpe(NULL, ec->gpe);
        status = acpi_install_address_space_handler(ec->handle,
                                                    ACPI_ADR_SPACE_EC,
                                                    &acpi_ec_space_handler,
@@ -839,7 +839,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
                } else {
                        acpi_remove_gpe_handler(NULL, ec->gpe,
                                &acpi_ec_gpe_handler);
-                       acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
+                       acpi_disable_gpe(NULL, ec->gpe);
                        return -ENODEV;
                }
        }
@@ -850,7 +850,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
 
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
-       acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
+       acpi_disable_gpe(NULL, ec->gpe);
        if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
                pr_err(PREFIX "failed to remove space handler\n");

diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index f8db50a0941c286eaba3466869ab4ed4fea23452..5981bd07e20e6f5d467764bf5468ba6a3ecabe61 100644 (file)
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -388,12 +388,10 @@ static ssize_t counter_set(struct kobject *kobj,
        if (index < num_gpes) {
                if (!strcmp(buf, "disable\n") &&
                                (status & ACPI_EVENT_FLAG_ENABLED))
-                       result = acpi_disable_gpe(handle, index,
-                                               ACPI_GPE_TYPE_RUNTIME);
+                       result = acpi_disable_gpe(handle, index);
                else if (!strcmp(buf, "enable\n") &&
                                !(status & ACPI_EVENT_FLAG_ENABLED))
-                       result = acpi_enable_gpe(handle, index,
-                                               ACPI_GPE_TYPE_RUNTIME);
+                       result = acpi_enable_gpe(handle, index);
                else if (!strcmp(buf, "clear\n") &&
                                (status & ACPI_EVENT_FLAG_SET))
                        result = acpi_clear_gpe(handle, index);

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 2e7a3bf13824945ac18ff54187146585e03d31f6..5342e037e37fe421258e1456707e47a4045744bb 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -295,14 +295,12 @@ static int acpi_dev_run_wake(struct device *phys_dev, bool enable)
                if (!dev->wakeup.run_wake_count++) {
                        acpi_enable_wakeup_device_power(dev, ACPI_STATE_S0);
                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                       dev->wakeup.gpe_number,
-                                       ACPI_GPE_TYPE_RUNTIME);
+                                       dev->wakeup.gpe_number);
                }
        } else if (dev->wakeup.run_wake_count > 0) {
                if (!--dev->wakeup.run_wake_count) {
                        acpi_disable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number,
-                                        ACPI_GPE_TYPE_RUNTIME);
+                                        dev->wakeup.gpe_number);
                        acpi_disable_wakeup_device_power(dev);
                }
        } else {

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 17396e83e1a4001f9ba963ff8be0d83352241131..354d785e80cbe7e89683a5e0136ae1fcf8475632 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -284,11 +284,9 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status);
  */
 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, u8 gpe_type);
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
 
-acpi_status
-acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type);
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
 
 acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number);
 

diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 6a65a94897bf68fe894382e5ca189a950cc60bce..a42513ded3a4d4353e13fe7620012ad3d4c88f0d 100644 (file)
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -669,12 +669,6 @@ typedef u32 acpi_event_status;
 #define ACPI_GPE_DISABLE                1
 #define ACPI_GPE_COND_ENABLE            2
 
-/* gpe_types for acpi_enable_gpe and acpi_disable_gpe */
-
-#define ACPI_GPE_TYPE_WAKE              (u8) 0x01
-#define ACPI_GPE_TYPE_RUNTIME           (u8) 0x02
-#define ACPI_GPE_TYPE_WAKE_RUN          (u8) 0x03
-
 /*
  * GPE info flags - Per GPE
  * +-------+---+-+-+