提交 5df0aa73 编写于 作者: D Daniel Lezcano 提交者: Rafael J. Wysocki

cpuidle: Introduce __cpuidle_device_init()

Add __cpuidle_device_init() for initializing the cpuidle_device
structure.

[rjw: Changelog]
Signed-off-by: NDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 f6bb51a5
...@@ -276,7 +276,7 @@ static void poll_idle_init(struct cpuidle_driver *drv) {} ...@@ -276,7 +276,7 @@ static void poll_idle_init(struct cpuidle_driver *drv) {}
*/ */
int cpuidle_enable_device(struct cpuidle_device *dev) int cpuidle_enable_device(struct cpuidle_device *dev)
{ {
int ret, i; int ret;
struct cpuidle_driver *drv; struct cpuidle_driver *drv;
if (!dev) if (!dev)
...@@ -306,12 +306,6 @@ int cpuidle_enable_device(struct cpuidle_device *dev) ...@@ -306,12 +306,6 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
(ret = cpuidle_curr_governor->enable(drv, dev))) (ret = cpuidle_curr_governor->enable(drv, dev)))
goto fail_sysfs; goto fail_sysfs;
for (i = 0; i < dev->state_count; i++) {
dev->states_usage[i].usage = 0;
dev->states_usage[i].time = 0;
}
dev->last_residency = 0;
smp_wmb(); smp_wmb();
dev->enabled = 1; dev->enabled = 1;
...@@ -364,6 +358,14 @@ static void __cpuidle_unregister_device(struct cpuidle_device *dev) ...@@ -364,6 +358,14 @@ static void __cpuidle_unregister_device(struct cpuidle_device *dev)
module_put(drv->owner); module_put(drv->owner);
} }
static int __cpuidle_device_init(struct cpuidle_device *dev)
{
memset(dev->states_usage, 0, sizeof(dev->states_usage));
dev->last_residency = 0;
return 0;
}
/** /**
* __cpuidle_register_device - internal register function called before register * __cpuidle_register_device - internal register function called before register
* and enable routines * and enable routines
...@@ -405,6 +407,10 @@ int cpuidle_register_device(struct cpuidle_device *dev) ...@@ -405,6 +407,10 @@ int cpuidle_register_device(struct cpuidle_device *dev)
mutex_lock(&cpuidle_lock); mutex_lock(&cpuidle_lock);
ret = __cpuidle_device_init(dev);
if (ret)
goto out_unlock;
ret = __cpuidle_register_device(dev); ret = __cpuidle_register_device(dev);
if (ret) if (ret)
goto out_unlock; goto out_unlock;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册