},
 };
 
-static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
-
 #ifdef CONFIG_PM_SLEEP
 static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev,
                                           struct cpuidle_driver *drv,
 
 int __init tegra30_cpuidle_init(void)
 {
-       int ret;
-       unsigned int cpu;
-       struct cpuidle_device *dev;
-       struct cpuidle_driver *drv = &tegra_idle_driver;
-
 #ifdef CONFIG_PM_SLEEP
        tegra_tear_down_cpu = tegra30_tear_down_cpu;
 #endif
-
-       ret = cpuidle_register_driver(&tegra_idle_driver);
-       if (ret) {
-               pr_err("CPUidle driver registration failed\n");
-               return ret;
-       }
-
-       for_each_possible_cpu(cpu) {
-               dev = &per_cpu(tegra_idle_device, cpu);
-               dev->cpu = cpu;
-
-               ret = cpuidle_register_device(dev);
-               if (ret) {
-                       pr_err("CPU%u: CPUidle device registration failed\n",
-                               cpu);
-                       return ret;
-               }
-       }
-       return 0;
+       return cpuidle_register(&tegra_idle_driver, NULL);
 }