1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index a428aa080a36..13bc83240adb 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2324,8 +2324,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).
          *
@@ -2342,7 +2340,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;
                 }
         }
@@ -2367,12 +2365,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);
         }
@@ -2523,7 +2522,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
@@ -2625,7 +2624,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;
                 }
         }