android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpuidle / sysfs: move kobj initialization in the syfs file

Browse Source 
Move the kobj initialization and completion in the sysfs.c
and encapsulate the code more.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Daniel Lezcano
2012-10-26 12:26:32 +02:00
committed by Rafael J. Wysocki
parent 1aef40e288
commit e45a00d679
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cpuidle/cpuidle.c
View File

@ -399,8 +399,6 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
if (!try_module_get(cpuidle_driver->owner)) if (!try_module_get(cpuidle_driver->owner))
return -EINVAL; return -EINVAL;
init_completion(&dev->kobj_unregister);
per_cpu(cpuidle_devices, dev->cpu) = dev; per_cpu(cpuidle_devices, dev->cpu) = dev;
list_add(&dev->device_list, &cpuidle_detected_devices); list_add(&dev->device_list, &cpuidle_detected_devices);
ret = cpuidle_add_sysfs(dev); ret = cpuidle_add_sysfs(dev);
@ -416,7 +414,6 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
err_coupled: err_coupled:
cpuidle_remove_sysfs(dev); cpuidle_remove_sysfs(dev);
wait_for_completion(&dev->kobj_unregister);
err_sysfs: err_sysfs:
list_del(&dev->device_list); list_del(&dev->device_list);
per_cpu(cpuidle_devices, dev->cpu) = NULL; per_cpu(cpuidle_devices, dev->cpu) = NULL;
@ -470,7 +467,6 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
cpuidle_remove_sysfs(dev); cpuidle_remove_sysfs(dev);
list_del(&dev->device_list); list_del(&dev->device_list);
wait_for_completion(&dev->kobj_unregister);
per_cpu(cpuidle_devices, dev->cpu) = NULL; per_cpu(cpuidle_devices, dev->cpu) = NULL;
cpuidle_coupled_unregister_device(dev); cpuidle_coupled_unregister_device(dev);

7
drivers/cpuidle/sysfs.c
View File

@ -374,8 +374,8 @@ int cpuidle_add_state_sysfs(struct cpuidle_device *device)
kobj->state_usage = &device->states_usage[i]; kobj->state_usage = &device->states_usage[i];
init_completion(&kobj->kobj_unregister); init_completion(&kobj->kobj_unregister);
ret = kobject_init_and_add(&kobj->kobj, &ktype_state_cpuidle, &device->kobj, ret = kobject_init_and_add(&kobj->kobj, &ktype_state_cpuidle,
"state%d", i); &device->kobj, "state%d", i);
if (ret) { if (ret) {
kfree(kobj); kfree(kobj);
goto error_state; goto error_state;
@ -413,6 +413,8 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev)
struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu); struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);
int error; int error;
init_completion(&dev->kobj_unregister);
error = kobject_init_and_add(&dev->kobj, &ktype_cpuidle, &cpu_dev->kobj, error = kobject_init_and_add(&dev->kobj, &ktype_cpuidle, &cpu_dev->kobj,
"cpuidle"); "cpuidle");
if (!error) if (!error)
@ -427,4 +429,5 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev)
void cpuidle_remove_sysfs(struct cpuidle_device *dev) void cpuidle_remove_sysfs(struct cpuidle_device *dev)
{ {
kobject_put(&dev->kobj); kobject_put(&dev->kobj);
wait_for_completion(&dev->kobj_unregister);
} }