5 files changed, 25 insertions, 32 deletions

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index c511def48b48..ec33fbdb919b 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -21,6 +21,7 @@ static inline void pm_runtime_early_init(struct device *dev)
 extern void pm_runtime_init(struct device *dev);
 extern void pm_runtime_reinit(struct device *dev);
 extern void pm_runtime_remove(struct device *dev);
+extern u64 pm_runtime_active_time(struct device *dev);
 
 #define WAKE_IRQ_DEDICATED_ALLOCATED    BIT(0)
 #define WAKE_IRQ_DEDICATED_MANAGED      BIT(1)
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 3382542b39b7..f80e402ef778 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -22,7 +22,7 @@
  * per-device constraint data struct.
  *
  * Note about the per-device constraint data struct allocation:
- * . The per-device constraints data struct ptr is tored into the device
+ * . The per-device constraints data struct ptr is stored into the device
  *    dev_pm_info.
  * . To minimize the data usage by the per-device constraints, the data struct
  *   is only allocated at the first call to dev_pm_qos_add_request.
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 78937c45278c..a2d22e3ecf3a 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -64,7 +64,7 @@ static int rpm_suspend(struct device *dev, int rpmflags);
  * runtime_status field is updated, to account the time in the old state
  * correctly.
  */
-void update_pm_runtime_accounting(struct device *dev)
+static void update_pm_runtime_accounting(struct device *dev)
 {
         u64 now, last, delta;
 
@@ -98,7 +98,7 @@ static void __update_runtime_status(struct device *dev, enum rpm_status status)
         dev->power.runtime_status = status;
 }
 
-u64 pm_runtime_suspended_time(struct device *dev)
+static u64 rpm_get_accounted_time(struct device *dev, bool suspended)
 {
         u64 time;
         unsigned long flags;
@@ -106,12 +106,22 @@ u64 pm_runtime_suspended_time(struct device *dev)
         spin_lock_irqsave(&dev->power.lock, flags);
 
         update_pm_runtime_accounting(dev);
-        time = dev->power.suspended_time;
+        time = suspended ? dev->power.suspended_time : dev->power.active_time;
 
         spin_unlock_irqrestore(&dev->power.lock, flags);
 
         return time;
 }
+
+u64 pm_runtime_active_time(struct device *dev)
+{
+        return rpm_get_accounted_time(dev, false);
+}
+
+u64 pm_runtime_suspended_time(struct device *dev)
+{
+        return rpm_get_accounted_time(dev, true);
+}
 EXPORT_SYMBOL_GPL(pm_runtime_suspended_time);
 
 /**
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index c6bf76124184..1226e441ddfe 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -125,13 +125,9 @@ static ssize_t runtime_active_time_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         int ret;
-        u64 tmp;
-        spin_lock_irq(&dev->power.lock);
-        update_pm_runtime_accounting(dev);
-        tmp = dev->power.active_time;
+        u64 tmp = pm_runtime_active_time(dev);
         do_div(tmp, NSEC_PER_MSEC);
         ret = sprintf(buf, "%llu\n", tmp);
-        spin_unlock_irq(&dev->power.lock);
         return ret;
 }
 
@@ -141,13 +137,9 @@ static ssize_t runtime_suspended_time_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         int ret;
-        u64 tmp;
-        spin_lock_irq(&dev->power.lock);
-        update_pm_runtime_accounting(dev);
-        tmp = dev->power.suspended_time;
+        u64 tmp = pm_runtime_suspended_time(dev);
         do_div(tmp, NSEC_PER_MSEC);
         ret = sprintf(buf, "%llu\n", tmp);
-        spin_unlock_irq(&dev->power.lock);
         return ret;
 }
 
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index d0e77d56c1d9..bb1ae175fae1 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -108,23 +108,6 @@ struct wakeup_source *wakeup_source_create(const char *name)
 }
 EXPORT_SYMBOL_GPL(wakeup_source_create);
 
-/**
- * wakeup_source_drop - Prepare a struct wakeup_source object for destruction.
- * @ws: Wakeup source to prepare for destruction.
- *
- * Callers must ensure that __pm_stay_awake() or __pm_wakeup_event() will never
- * be run in parallel with this function for the same wakeup source object.
- */
-void wakeup_source_drop(struct wakeup_source *ws)
-{
-        if (!ws)
-                return;
-
-        del_timer_sync(&ws->timer);
-        __pm_relax(ws);
-}
-EXPORT_SYMBOL_GPL(wakeup_source_drop);
-
 /*
  * Record wakeup_source statistics being deleted into a dummy wakeup_source.
  */
@@ -164,7 +147,7 @@ void wakeup_source_destroy(struct wakeup_source *ws)
         if (!ws)
                 return;
 
-        wakeup_source_drop(ws);
+        __pm_relax(ws);
         wakeup_source_record(ws);
         kfree_const(ws->name);
         kfree(ws);
@@ -207,6 +190,13 @@ void wakeup_source_remove(struct wakeup_source *ws)
         list_del_rcu(&ws->entry);
         raw_spin_unlock_irqrestore(&events_lock, flags);
         synchronize_srcu(&wakeup_srcu);
+
+        del_timer_sync(&ws->timer);
+        /*
+         * Clear timer.function to make wakeup_source_not_registered() treat
+         * this wakeup source as not registered.
+         */
+        ws->timer.function = NULL;
 }
 EXPORT_SYMBOL_GPL(wakeup_source_remove);