4 files changed, 12 insertions, 59 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index bb5c8cb6417..a90480baa85 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -63,7 +63,7 @@ static int async_error;
  */
 void device_pm_init(struct device *dev)
 {
-        dev->power.status = DPM_ON;
+        dev->power.in_suspend = false;
         init_completion(&dev->power.completion);
         complete_all(&dev->power.completion);
         dev->power.wakeup = NULL;
@@ -98,7 +98,7 @@ void device_pm_add(struct device *dev)
                  kobject_name(&dev->kobj));
         mutex_lock(&dpm_list_mtx);
         if (dev->parent) {
-                if (dev->parent->power.status >= DPM_SUSPENDING)
+                if (dev->parent->power.in_suspend)
                         dev_warn(dev, "parent %s should not be sleeping\n",
                                  dev_name(dev->parent));
         } else if (transition_started) {
@@ -488,7 +488,6 @@ void dpm_resume_noirq(pm_message_t state)
                 int error;
 
                 get_device(dev);
-                dev->power.status = DPM_OFF;
                 list_move_tail(&dev->power.entry, &dpm_suspended_list);
                 mutex_unlock(&dpm_list_mtx);
 
@@ -541,7 +540,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
         dpm_wait(dev->parent, async);
         device_lock(dev);
 
-        dev->power.status = DPM_RESUMING;
+        dev->power.in_suspend = false;
 
         if (dev->bus) {
                 if (dev->bus->pm) {
@@ -690,7 +689,7 @@ static void dpm_complete(pm_message_t state)
                 struct device *dev = to_device(dpm_prepared_list.prev);
 
                 get_device(dev);
-                dev->power.status = DPM_ON;
+                dev->power.in_suspend = false;
                 list_move(&dev->power.entry, &list);
                 mutex_unlock(&dpm_list_mtx);
 
@@ -806,7 +805,6 @@ int dpm_suspend_noirq(pm_message_t state)
                         put_device(dev);
                         break;
                 }
-                dev->power.status = DPM_OFF_IRQ;
                 if (!list_empty(&dev->power.entry))
                         list_move(&dev->power.entry, &dpm_noirq_list);
                 put_device(dev);
@@ -894,9 +892,6 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
                 }
         }
 
-        if (!error)
-                dev->power.status = DPM_OFF;
-
  End:
         device_unlock(dev);
         complete_all(&dev->power.completion);
@@ -1030,7 +1025,6 @@ static int dpm_prepare(pm_message_t state)
                 struct device *dev = to_device(dpm_list.next);
 
                 get_device(dev);
-                dev->power.status = DPM_PREPARING;
                 mutex_unlock(&dpm_list_mtx);
 
                 pm_runtime_get_noresume(dev);
@@ -1046,7 +1040,6 @@ static int dpm_prepare(pm_message_t state)
 
                 mutex_lock(&dpm_list_mtx);
                 if (error) {
-                        dev->power.status = DPM_ON;
                         if (error == -EAGAIN) {
                                 put_device(dev);
                                 error = 0;
@@ -1058,7 +1051,7 @@ static int dpm_prepare(pm_message_t state)
                         put_device(dev);
                         break;
                 }
-                dev->power.status = DPM_SUSPENDING;
+                dev->power.in_suspend = true;
                 if (!list_empty(&dev->power.entry))
                         list_move_tail(&dev->power.entry, &dpm_prepared_list);
                 put_device(dev);
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index c0e60fbcb04..4ec50224ee8 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -376,7 +376,7 @@ static int usb_unbind_interface(struct device *dev)
                  * Just re-enable it without affecting the endpoint toggles.
                  */
                 usb_enable_interface(udev, intf, false);
-        } else if (!error && intf->dev.power.status == DPM_ON) {
+        } else if (!error && !intf->dev.power.in_suspend) {
                 r = usb_set_interface(udev, intf->altsetting[0].
                                 desc.bInterfaceNumber, 0);
                 if (r < 0)
@@ -961,7 +961,7 @@ void usb_rebind_intf(struct usb_interface *intf)
         }
 
         /* Try to rebind the interface */
-        if (intf->dev.power.status == DPM_ON) {
+        if (!intf->dev.power.in_suspend) {
                 intf->needs_binding = 0;
                 rc = device_attach(&intf->dev);
                 if (rc < 0)
@@ -1108,8 +1108,7 @@ static int usb_resume_interface(struct usb_device *udev,
         if (intf->condition == USB_INTERFACE_UNBOUND) {
 
                 /* Carry out a deferred switch to altsetting 0 */
-                if (intf->needs_altsetting0 &&
-                                intf->dev.power.status == DPM_ON) {
+                if (intf->needs_altsetting0 && !intf->dev.power.in_suspend) {
                         usb_set_interface(udev, intf->altsetting[0].
                                         desc.bInterfaceNumber, 0);
                         intf->needs_altsetting0 = 0;
diff --git a/include/linux/device.h b/include/linux/device.h
index dd489531346..45bc8c1669d 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -508,13 +508,13 @@ static inline int device_is_registered(struct device *dev)
 
 static inline void device_enable_async_suspend(struct device *dev)
 {
-        if (dev->power.status == DPM_ON)
+        if (!dev->power.in_suspend)
                 dev->power.async_suspend = true;
 }
 
 static inline void device_disable_async_suspend(struct device *dev)
 {
-        if (dev->power.status == DPM_ON)
+        if (!dev->power.in_suspend)
                 dev->power.async_suspend = false;
 }
 
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 61f2066e685..c1756dfeb8c 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -367,45 +367,6 @@ extern struct dev_pm_ops generic_subsys_pm_ops;
                                         { .event = PM_EVENT_AUTO_RESUME, })
 
 /**
- * Device power management states
- *
- * These state labels are used internally by the PM core to indicate the current
- * status of a device with respect to the PM core operations.
- *
- * DPM_ON               Device is regarded as operational.  Set this way
- *                      initially and when ->complete() is about to be called.
- *                      Also set when ->prepare() fails.
- *
- * DPM_PREPARING        Device is going to be prepared for a PM transition.  Set
- *                      when ->prepare() is about to be called.
- *
- * DPM_RESUMING         Device is going to be resumed.  Set when ->resume(),
- *                      ->thaw(), or ->restore() is about to be called.
- *
- * DPM_SUSPENDING       Device has been prepared for a power transition.  Set
- *                      when ->prepare() has just succeeded.
- *
- * DPM_OFF              Device is regarded as inactive.  Set immediately after
- *                      ->suspend(), ->freeze(), or ->poweroff() has succeeded.
- *                      Also set when ->resume()_noirq, ->thaw_noirq(), or
- *                      ->restore_noirq() is about to be called.
- *
- * DPM_OFF_IRQ          Device is in a "deep sleep".  Set immediately after
- *                      ->suspend_noirq(), ->freeze_noirq(), or
- *                      ->poweroff_noirq() has just succeeded.
- */
-
-enum dpm_state {
-        DPM_INVALID,
-        DPM_ON,
-        DPM_PREPARING,
-        DPM_RESUMING,
-        DPM_SUSPENDING,
-        DPM_OFF,
-        DPM_OFF_IRQ,
-};
-
-/**
  * Device run-time power management status.
  *
  * These status labels are used internally by the PM core to indicate the
@@ -463,8 +424,8 @@ struct wakeup_source;
 struct dev_pm_info {
         pm_message_t            power_state;
         unsigned int            can_wakeup:1;
-        unsigned                async_suspend:1;
-        enum dpm_state          status;         /* Owned by the PM core */
+        unsigned int            async_suspend:1;
+        unsigned int            in_suspend:1;   /* Owned by the PM core */
         spinlock_t              lock;
 #ifdef CONFIG_PM_SLEEP
         struct list_head        entry;