Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
  PM / Clocks: Remove redundant NULL checks before kfree()
  PM / Documentation: Update docs about suspend and CPU hotplug
  ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
  ARM: mach-shmobile: sh7372 A4R support (v4)
  ARM: mach-shmobile: sh7372 A3SP support (v4)
  PM / Sleep: Mark devices involved in wakeup signaling during suspend
  PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
  PM / Hibernate: Do not initialize static and extern variables to 0
  PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
  PM / Hibernate: Add resumedelay kernel param in addition to resumewait
  MAINTAINERS: Update linux-pm list address
  PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
  PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
  PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
  PM / Hibernate: Fix typo in a kerneldoc comment
  PM / Hibernate: Freeze kernel threads after preallocating memory
  PM: Update the policy on default wakeup settings
  PM / VT: Cleanup #if defined uglyness and fix compile error
  PM / Suspend: Off by one in pm_suspend()
  PM / Hibernate: Include storage keys in hibernation image on s390
  ...

7 files changed, 22 insertions, 23 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 3ec6699ab725..6960715c5063 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1305,7 +1305,7 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
         struct acm *acm = usb_get_intfdata(intf);
         int cnt;
 
-        if (message.event & PM_EVENT_AUTO) {
+        if (PMSG_IS_AUTO(message)) {
                 int b;
 
                 spin_lock_irq(&acm->write_lock);
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 1d26a7135dd9..efe684908c1f 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -798,11 +798,11 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
         dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor);
 
         /* if this is an autosuspend the caller does the locking */
-        if (!(message.event & PM_EVENT_AUTO))
+        if (!PMSG_IS_AUTO(message))
                 mutex_lock(&desc->lock);
         spin_lock_irq(&desc->iuspin);
 
-        if ((message.event & PM_EVENT_AUTO) &&
+        if (PMSG_IS_AUTO(message) &&
                         (test_bit(WDM_IN_USE, &desc->flags)
                         || test_bit(WDM_RESPONDING, &desc->flags))) {
                 spin_unlock_irq(&desc->iuspin);
@@ -815,7 +815,7 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
                 kill_urbs(desc);
                 cancel_work_sync(&desc->rxwork);
         }
-        if (!(message.event & PM_EVENT_AUTO))
+        if (!PMSG_IS_AUTO(message))
                 mutex_unlock(&desc->lock);
 
         return rv;
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index adf5ca8a2396..3b029a0a4787 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1046,8 +1046,7 @@ static int usb_resume_device(struct usb_device *udev, pm_message_t msg)
         /* Non-root devices on a full/low-speed bus must wait for their
          * companion high-speed root hub, in case a handoff is needed.
          */
-        if (!(msg.event & PM_EVENT_AUTO) && udev->parent &&
-                        udev->bus->hs_companion)
+        if (!PMSG_IS_AUTO(msg) && udev->parent && udev->bus->hs_companion)
                 device_pm_wait_for_dev(&udev->dev,
                                 &udev->bus->hs_companion->root_hub->dev);
 
@@ -1075,7 +1074,7 @@ static int usb_suspend_interface(struct usb_device *udev,
 
         if (driver->suspend) {
                 status = driver->suspend(intf, msg);
-                if (status && !(msg.event & PM_EVENT_AUTO))
+                if (status && !PMSG_IS_AUTO(msg))
                         dev_err(&intf->dev, "%s error %d\n",
                                         "suspend", status);
         } else {
@@ -1189,7 +1188,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
                         status = usb_suspend_interface(udev, intf, msg);
 
                         /* Ignore errors during system sleep transitions */
-                        if (!(msg.event & PM_EVENT_AUTO))
+                        if (!PMSG_IS_AUTO(msg))
                                 status = 0;
                         if (status != 0)
                                 break;
@@ -1199,7 +1198,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
                 status = usb_suspend_device(udev, msg);
 
                 /* Again, ignore errors during system sleep transitions */
-                if (!(msg.event & PM_EVENT_AUTO))
+                if (!PMSG_IS_AUTO(msg))
                         status = 0;
         }
 
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index b3b7d062906d..13222d352a61 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1975,8 +1975,9 @@ int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg)
         int             status;
         int             old_state = hcd->state;
 
-        dev_dbg(&rhdev->dev, "bus %s%s\n",
-                        (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "suspend");
+        dev_dbg(&rhdev->dev, "bus %ssuspend, wakeup %d\n",
+                        (PMSG_IS_AUTO(msg) ? "auto-" : ""),
+                        rhdev->do_remote_wakeup);
         if (HCD_DEAD(hcd)) {
                 dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "suspend");
                 return 0;
@@ -2011,8 +2012,8 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)
         int             status;
         int             old_state = hcd->state;
 
-        dev_dbg(&rhdev->dev, "usb %s%s\n",
-                        (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
+        dev_dbg(&rhdev->dev, "usb %sresume\n",
+                        (PMSG_IS_AUTO(msg) ? "auto-" : ""));
         if (HCD_DEAD(hcd)) {
                 dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "resume");
                 return 0;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index d6cc83249341..96f05b29c9ad 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2369,8 +2369,6 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
         int             port1 = udev->portnum;
         int             status;
 
-        // dev_dbg(hub->intfdev, "suspend port %d\n", port1);
-
         /* enable remote wakeup when appropriate; this lets the device
          * wake up the upstream hub (including maybe the root hub).
          *
@@ -2387,7 +2385,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
                         dev_dbg(&udev->dev, "won't remote wakeup, status %d\n",
                                         status);
                         /* bail if autosuspend is requested */
-                        if (msg.event & PM_EVENT_AUTO)
+                        if (PMSG_IS_AUTO(msg))
                                 return status;
                 }
         }
@@ -2416,12 +2414,13 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
                                 USB_CTRL_SET_TIMEOUT);
 
                 /* System sleep transitions should never fail */
-                if (!(msg.event & PM_EVENT_AUTO))
+                if (!PMSG_IS_AUTO(msg))
                         status = 0;
         } else {
                 /* device has up to 10 msec to fully suspend */
-                dev_dbg(&udev->dev, "usb %ssuspend\n",
-                                (msg.event & PM_EVENT_AUTO ? "auto-" : ""));
+                dev_dbg(&udev->dev, "usb %ssuspend, wakeup %d\n",
+                                (PMSG_IS_AUTO(msg) ? "auto-" : ""),
+                                udev->do_remote_wakeup);
                 usb_set_device_state(udev, USB_STATE_SUSPENDED);
                 msleep(10);
         }
@@ -2572,7 +2571,7 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
         } else {
                 /* drive resume for at least 20 msec */
                 dev_dbg(&udev->dev, "usb %sresume\n",
-                                (msg.event & PM_EVENT_AUTO ? "auto-" : ""));
+                                (PMSG_IS_AUTO(msg) ? "auto-" : ""));
                 msleep(25);
 
                 /* Virtual root hubs can trigger on GET_PORT_STATUS to
@@ -2679,7 +2678,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
                 udev = hdev->children [port1-1];
                 if (udev && udev->can_submit) {
                         dev_warn(&intf->dev, "port %d nyet suspended\n", port1);
-                        if (msg.event & PM_EVENT_AUTO)
+                        if (PMSG_IS_AUTO(msg))
                                 return -EBUSY;
                 }
         }
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index d5d136a53b61..b18179bda0d8 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1009,7 +1009,7 @@ static int sierra_suspend(struct usb_serial *serial, pm_message_t message)
         struct sierra_intf_private *intfdata;
         int b;
 
-        if (message.event & PM_EVENT_AUTO) {
+        if (PMSG_IS_AUTO(message)) {
                 intfdata = serial->private;
                 spin_lock_irq(&intfdata->susp_lock);
                 b = intfdata->in_flight;
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index e4fad5e643d7..d555ca9567b8 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -651,7 +651,7 @@ int usb_wwan_suspend(struct usb_serial *serial, pm_message_t message)
 
         dbg("%s entered", __func__);
 
-        if (message.event & PM_EVENT_AUTO) {
+        if (PMSG_IS_AUTO(message)) {
                 spin_lock_irq(&intfdata->susp_lock);
                 b = intfdata->in_flight;
                 spin_unlock_irq(&intfdata->susp_lock);