Merge branches 'pm-pci', 'pm-avs' and 'pm-docs'

* pm-pci:
  PCI / PM: Add dev_dbg() to print device suspend power states
  PCI / PM: Do not resume any devices in pci_pm_prepare()

* pm-avs:
  PM / AVS: Use %pS printk format for direct addresses

* pm-docs:
  PM: docs: Fix formatting typo in devices.rst

diff --git a/Documentation/driver-api/pm/devices.rst b/Documentation/driver-api/pm/devices.rst
index a0dc2879a152c89dbb9d5f715ec07fbfe6a4cd8e..b8f1e3bdb743068d09da62fe04f787bff6804685 100644 (file)
--- a/Documentation/driver-api/pm/devices.rst
+++ b/Documentation/driver-api/pm/devices.rst
@@ -274,7 +274,7 @@ sleep states and the hibernation state ("suspend-to-disk").  Each phase involves
 executing callbacks for every device before the next phase begins.  Not all
 buses or classes support all these callbacks and not all drivers use all the
 callbacks.  The various phases always run after tasks have been frozen and
-before they are unfrozen.  Furthermore, the ``*_noirq phases`` run at a time
+before they are unfrozen.  Furthermore, the ``*_noirq`` phases run at a time
 when IRQ handlers have been disabled (except for those marked with the
 IRQF_NO_SUSPEND flag).
 

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 11bd267fc1371acc303795876a6fba0b7725767a..9be563067c0cd2c149b7b8ff5fe04791ba85b5bb 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -680,13 +680,6 @@ static int pci_pm_prepare(struct device *dev)
 {
        struct device_driver *drv = dev->driver;
 
-       /*
-        * Devices having power.ignore_children set may still be necessary for
-        * suspending their children in the next phase of device suspend.
-        */
-       if (dev->power.ignore_children)
-               pm_runtime_resume(dev);
-
        if (drv && drv->pm && drv->pm->prepare) {
                int error = drv->pm->prepare(dev);
                if (error)
@@ -805,6 +798,9 @@ static int pci_pm_suspend_noirq(struct device *dev)
                        pci_prepare_to_sleep(pci_dev);
        }
 
+       dev_dbg(dev, "PCI PM: Suspend power state: %s\n",
+               pci_power_name(pci_dev->current_state));
+
        pci_pm_set_unknown_state(pci_dev);
 
        /*

diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index 974fd684bab2c74400f8904fb557a5ac21ac9f26..89bf4d6cb4863916e3f7200adf0cfa2f79c15036 100644 (file)
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -355,7 +355,7 @@ int sr_configure_errgen(struct omap_sr *sr)
        u8 senp_shift, senn_shift;
 
        if (!sr) {
-               pr_warn("%s: NULL omap_sr from %pF\n",
+               pr_warn("%s: NULL omap_sr from %pS\n",
                        __func__, (void *)_RET_IP_);
                return -EINVAL;
        }
@@ -422,7 +422,7 @@ int sr_disable_errgen(struct omap_sr *sr)
        u32 vpboundint_en, vpboundint_st;
 
        if (!sr) {
-               pr_warn("%s: NULL omap_sr from %pF\n",
+               pr_warn("%s: NULL omap_sr from %pS\n",
                        __func__, (void *)_RET_IP_);
                return -EINVAL;
        }
@@ -477,7 +477,7 @@ int sr_configure_minmax(struct omap_sr *sr)
        u8 senp_shift, senn_shift;
 
        if (!sr) {
-               pr_warn("%s: NULL omap_sr from %pF\n",
+               pr_warn("%s: NULL omap_sr from %pS\n",
                        __func__, (void *)_RET_IP_);
                return -EINVAL;
        }
@@ -562,7 +562,7 @@ int sr_enable(struct omap_sr *sr, unsigned long volt)
        int ret;
 
        if (!sr) {
-               pr_warn("%s: NULL omap_sr from %pF\n",
+               pr_warn("%s: NULL omap_sr from %pS\n",
                        __func__, (void *)_RET_IP_);
                return -EINVAL;
        }
@@ -614,7 +614,7 @@ int sr_enable(struct omap_sr *sr, unsigned long volt)
 void sr_disable(struct omap_sr *sr)
 {
        if (!sr) {
-               pr_warn("%s: NULL omap_sr from %pF\n",
+               pr_warn("%s: NULL omap_sr from %pS\n",
                        __func__, (void *)_RET_IP_);
                return;
        }