4 files changed, 22 insertions, 3 deletions

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index cb28e0502acc..9c4c962e46e3 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -36,8 +36,6 @@ static inline int acpi_debug_init(void) { return 0; }
 int acpi_power_init(void);
 int acpi_device_sleep_wake(struct acpi_device *dev,
                            int enable, int sleep_state, int dev_state);
-int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
-int acpi_disable_wakeup_device_power(struct acpi_device *dev);
 int acpi_power_get_inferred_state(struct acpi_device *device);
 int acpi_power_transition(struct acpi_device *device, int state);
 extern int acpi_power_nocheck;
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index a5a77b78a723..2ef04098cc1d 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -26,7 +26,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci-acpi.h>
 #include <linux/acpi.h>
+#include <linux/pm_runtime.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
@@ -38,7 +40,13 @@ static int acpi_pci_unbind(struct acpi_device *device)
         struct pci_dev *dev;
 
         dev = acpi_get_pci_dev(device->handle);
-        if (!dev || !dev->subordinate)
+        if (!dev)
+                goto out;
+
+        device_set_run_wake(&dev->dev, false);
+        pci_acpi_remove_pm_notifier(device);
+
+        if (!dev->subordinate)
                 goto out;
 
         acpi_pci_irq_del_prt(dev->subordinate);
@@ -62,6 +70,10 @@ static int acpi_pci_bind(struct acpi_device *device)
         if (!dev)
                 return 0;
 
+        pci_acpi_add_pm_notifier(device, dev);
+        if (device->wakeup.flags.run_wake)
+                device_set_run_wake(&dev->dev, true);
+
         /*
          * Install the 'bind' function to facilitate callbacks for
          * children of the P2P bridge.
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 64f55b6db73c..9cd8bedb1e5a 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -30,6 +30,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/pm.h>
+#include <linux/pm_runtime.h>
 #include <linux/pci.h>
 #include <linux/pci-acpi.h>
 #include <linux/acpi.h>
@@ -528,6 +529,10 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         if (flags != base_flags)
                 acpi_pci_osc_support(root, flags);
 
+        pci_acpi_add_bus_pm_notifier(device, root->bus);
+        if (device->wakeup.flags.run_wake)
+                device_set_run_wake(root->bus->bridge, true);
+
         return 0;
 
 end:
@@ -549,6 +554,9 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
 {
         struct acpi_pci_root *root = acpi_driver_data(device);
 
+        device_set_run_wake(root->bus->bridge, false);
+        pci_acpi_remove_bus_pm_notifier(device);
+
         kfree(root);
         return 0;
 }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7491a52ad97a..fb7fc24fe727 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -753,6 +753,7 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
         acpi_event_status event_status;
 
         device->wakeup.run_wake_count = 0;
+        device->wakeup.flags.notifier_present = 0;
 
         /* Power button, Lid switch always enable wakeup */
         if (!acpi_match_device_ids(device, button_device_ids)) {