Merge branch 'pm-core'

* pm-core:
  driver core: Avoid NULL pointer dereferences in device_is_bound()
  platform: Do not detach from PM domains on shutdown
  USB / PM: Allow USB devices to remain runtime-suspended when sleeping
  PM / sleep: Go direct_complete if driver has no callbacks
  PM / Domains: add setter for dev.pm_domain
  device core: add device_is_bound()

2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 047281a6ae11..c570b1d9f094 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -18,6 +18,7 @@
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/clk-lpss.h>
+#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/delay.h>
 
@@ -875,13 +876,14 @@ static int acpi_lpss_platform_notify(struct notifier_block *nb,
 
         switch (action) {
         case BUS_NOTIFY_BIND_DRIVER:
-                pdev->dev.pm_domain = &acpi_lpss_pm_domain;
+                dev_pm_domain_set(&pdev->dev, &acpi_lpss_pm_domain);
                 break;
         case BUS_NOTIFY_DRIVER_NOT_BOUND:
         case BUS_NOTIFY_UNBOUND_DRIVER:
                 pdev->dev.pm_domain = NULL;
                 break;
         case BUS_NOTIFY_ADD_DEVICE:
+                dev_pm_domain_set(&pdev->dev, &acpi_lpss_pm_domain);
                 if (pdata->dev_desc->flags & LPSS_LTR)
                         return sysfs_create_group(&pdev->dev.kobj,
                                                   &lpss_attr_group);
@@ -889,6 +891,7 @@ static int acpi_lpss_platform_notify(struct notifier_block *nb,
         case BUS_NOTIFY_DEL_DEVICE:
                 if (pdata->dev_desc->flags & LPSS_LTR)
                         sysfs_remove_group(&pdev->dev.kobj, &lpss_attr_group);
+                dev_pm_domain_set(&pdev->dev, NULL);
                 break;
         default:
                 break;
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 08a02cdc737c..cd2c3d6d40e0 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -22,6 +22,7 @@
 #include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/pm_qos.h>
+#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 
 #include "internal.h"
@@ -1059,7 +1060,7 @@ static void acpi_dev_pm_detach(struct device *dev, bool power_off)
         struct acpi_device *adev = ACPI_COMPANION(dev);
 
         if (adev && dev->pm_domain == &acpi_general_pm_domain) {
-                dev->pm_domain = NULL;
+                dev_pm_domain_set(dev, NULL);
                 acpi_remove_pm_notifier(adev);
                 if (power_off) {
                         /*
@@ -1111,7 +1112,7 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
                 return -EBUSY;
 
         acpi_add_pm_notifier(adev, dev, acpi_pm_notify_work_func);
-        dev->pm_domain = &acpi_general_pm_domain;
+        dev_pm_domain_set(dev, &acpi_general_pm_domain);
         if (power_on) {
                 acpi_dev_pm_full_power(adev);
                 acpi_device_wakeup(adev, ACPI_STATE_S0, false);