Merge tag 'for-linux-3.3-merge-window' of git://linux-c6x.org/git/projects/linux...

[~andy/linux] / drivers / cpuidle / cpuidle.c

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 06ce2680d00d4ff33582d04cc9cb67eabf0bc442..59f4261c753a019a157256b081d905a9ba3e4e79 100644 (file)
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -291,10 +291,10 @@ EXPORT_SYMBOL_GPL(cpuidle_disable_device);
 static int __cpuidle_register_device(struct cpuidle_device *dev)
 {
        int ret;
-       struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu);
+       struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);
        struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
 
-       if (!sys_dev)
+       if (!dev)
                return -EINVAL;
        if (!try_module_get(cpuidle_driver->owner))
                return -EINVAL;
@@ -303,7 +303,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
 
        per_cpu(cpuidle_devices, dev->cpu) = dev;
        list_add(&dev->device_list, &cpuidle_detected_devices);
-       if ((ret = cpuidle_add_sysfs(sys_dev))) {
+       if ((ret = cpuidle_add_sysfs(cpu_dev))) {
                module_put(cpuidle_driver->owner);
                return ret;
        }
@@ -344,7 +344,7 @@ EXPORT_SYMBOL_GPL(cpuidle_register_device);
  */
 void cpuidle_unregister_device(struct cpuidle_device *dev)
 {
-       struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu);
+       struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);
        struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
 
        if (dev->registered == 0)
@@ -354,7 +354,7 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
 
        cpuidle_disable_device(dev);
 
-       cpuidle_remove_sysfs(sys_dev);
+       cpuidle_remove_sysfs(cpu_dev);
        list_del(&dev->device_list);
        wait_for_completion(&dev->kobj_unregister);
        per_cpu(cpuidle_devices, dev->cpu) = NULL;
@@ -411,7 +411,7 @@ static int __init cpuidle_init(void)
        if (cpuidle_disabled())
                return -ENODEV;
 
-       ret = cpuidle_add_class_sysfs(&cpu_sysdev_class);
+       ret = cpuidle_add_interface(cpu_subsys.dev_root);
        if (ret)
                return ret;