Commit 4769373c authored by Alan Stern's avatar Alan Stern Committed by Rafael J. Wysocki
Browse files

PM / Runtime: Move code in drivers/base/power/runtime.c 



This patch (as1421) moves the PM runtime accounting subroutines up to
the beginning of runtime.c, taking them out of the middle of the
functions that do the actual work.  No operational changes.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 69d44ffb

drivers/base/power/runtime.c

+38 −39
Original line number Diff line number Diff line
@@ -14,6 +14,44 @@ static int __pm_runtime_resume(struct device *dev, bool from_wq); 
static int __pm_request_idle(struct device *dev);

static int __pm_request_resume(struct device *dev);



/**

 * update_pm_runtime_accounting - Update the time accounting of power states

 * @dev: Device to update the accounting for

 *

 * In order to be able to have time accounting of the various power states

 * (as used by programs such as PowerTOP to show the effectiveness of runtime

 * PM), we need to track the time spent in each state.

 * update_pm_runtime_accounting must be called each time before the

 * runtime_status field is updated, to account the time in the old state

 * correctly.

 */

void update_pm_runtime_accounting(struct device *dev)

{

	unsigned long now = jiffies;

	int delta;



	delta = now - dev->power.accounting_timestamp;



	if (delta < 0)

		delta = 0;



	dev->power.accounting_timestamp = now;



	if (dev->power.disable_depth > 0)

		return;



	if (dev->power.runtime_status == RPM_SUSPENDED)

		dev->power.suspended_jiffies += delta;

	else

		dev->power.active_jiffies += delta;

}



static void __update_runtime_status(struct device *dev, enum rpm_status status)

{

	update_pm_runtime_accounting(dev);

	dev->power.runtime_status = status;

}



/**

 * pm_runtime_deactivate_timer - Deactivate given device's suspend timer.

 * @dev: Device to handle.
@@ -123,45 +161,6 @@ int pm_runtime_idle(struct device *dev) 
}

EXPORT_SYMBOL_GPL(pm_runtime_idle);





/**

 * update_pm_runtime_accounting - Update the time accounting of power states

 * @dev: Device to update the accounting for

 *

 * In order to be able to have time accounting of the various power states

 * (as used by programs such as PowerTOP to show the effectiveness of runtime

 * PM), we need to track the time spent in each state.

 * update_pm_runtime_accounting must be called each time before the

 * runtime_status field is updated, to account the time in the old state

 * correctly.

 */

void update_pm_runtime_accounting(struct device *dev)

{

	unsigned long now = jiffies;

	int delta;



	delta = now - dev->power.accounting_timestamp;



	if (delta < 0)

		delta = 0;



	dev->power.accounting_timestamp = now;



	if (dev->power.disable_depth > 0)

		return;



	if (dev->power.runtime_status == RPM_SUSPENDED)

		dev->power.suspended_jiffies += delta;

	else

		dev->power.active_jiffies += delta;

}



static void __update_runtime_status(struct device *dev, enum rpm_status status)

{

	update_pm_runtime_accounting(dev);

	dev->power.runtime_status = status;

}



/**

 * __pm_runtime_suspend - Carry out run-time suspend of given device.

 * @dev: Device to suspend.

CRA Git | Maintained and supported by SUSTech CRA and CCSE