Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc56c07 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM-runtime: Consolidate code to get active/suspended time 



In a step to consolidate the code for fetching the PM-runtime
active/suspended time for a device, add a common function for that
and make the existing pm_runtime_suspended_time() call it.

Also add a corresponding pm_runtime_active_time() calling the new
common function.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
[ rjw: Changelog, function rename ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ef800684

drivers/base/power/power.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

drivers/base/power/runtime.c

+12 −2
Original line number Diff line number Diff line
@@ -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);



/**