diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-06-30 22:11:45 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-07-06 22:34:26 -0400 |
commit | a44061aa8b5d58b2729faca4c155a94a5bea2a09 (patch) | |
tree | 3f4e72439ad65c443c0151961883ea0a6e14d20d /drivers/pci | |
parent | e8b6f970107cfc9c00cdcdb12ec6c7e135cf379f (diff) |
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/pci-acpi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 2e7a3bf13824..5342e037e37f 100644 --- 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) | |||
295 | if (!dev->wakeup.run_wake_count++) { | 295 | if (!dev->wakeup.run_wake_count++) { |
296 | acpi_enable_wakeup_device_power(dev, ACPI_STATE_S0); | 296 | acpi_enable_wakeup_device_power(dev, ACPI_STATE_S0); |
297 | acpi_enable_gpe(dev->wakeup.gpe_device, | 297 | acpi_enable_gpe(dev->wakeup.gpe_device, |
298 | dev->wakeup.gpe_number, | 298 | dev->wakeup.gpe_number); |
299 | ACPI_GPE_TYPE_RUNTIME); | ||
300 | } | 299 | } |
301 | } else if (dev->wakeup.run_wake_count > 0) { | 300 | } else if (dev->wakeup.run_wake_count > 0) { |
302 | if (!--dev->wakeup.run_wake_count) { | 301 | if (!--dev->wakeup.run_wake_count) { |
303 | acpi_disable_gpe(dev->wakeup.gpe_device, | 302 | acpi_disable_gpe(dev->wakeup.gpe_device, |
304 | dev->wakeup.gpe_number, | 303 | dev->wakeup.gpe_number); |
305 | ACPI_GPE_TYPE_RUNTIME); | ||
306 | acpi_disable_wakeup_device_power(dev); | 304 | acpi_disable_wakeup_device_power(dev); |
307 | } | 305 | } |
308 | } else { | 306 | } else { |