提交 472a85f7 编写于 作者: D Daniel Lezcano 提交者: Rafael J. Wysocki

ARM: OMAP3: cpuidle: use init/exit common routine

Remove the duplicated code and use the cpuidle common code for initialization.
Signed-off-by: NDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: NKevin Hilman <khilman@linaro.org>
Tested-by: NKevin Hilman <khilman@linaro.org>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 22f5d1fa
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/cpu_pm.h> #include <linux/cpu_pm.h>
#include <asm/cpuidle.h>
#include "powerdomain.h" #include "powerdomain.h"
#include "clockdomain.h" #include "clockdomain.h"
...@@ -259,8 +260,6 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, ...@@ -259,8 +260,6 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
return ret; return ret;
} }
static DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
static struct cpuidle_driver omap3_idle_driver = { static struct cpuidle_driver omap3_idle_driver = {
.name = "omap3_idle", .name = "omap3_idle",
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -336,8 +335,6 @@ static struct cpuidle_driver omap3_idle_driver = { ...@@ -336,8 +335,6 @@ static struct cpuidle_driver omap3_idle_driver = {
*/ */
int __init omap3_idle_init(void) int __init omap3_idle_init(void)
{ {
struct cpuidle_device *dev;
mpu_pd = pwrdm_lookup("mpu_pwrdm"); mpu_pd = pwrdm_lookup("mpu_pwrdm");
core_pd = pwrdm_lookup("core_pwrdm"); core_pd = pwrdm_lookup("core_pwrdm");
per_pd = pwrdm_lookup("per_pwrdm"); per_pd = pwrdm_lookup("per_pwrdm");
...@@ -346,20 +343,5 @@ int __init omap3_idle_init(void) ...@@ -346,20 +343,5 @@ int __init omap3_idle_init(void)
if (!mpu_pd || !core_pd || !per_pd || !cam_pd) if (!mpu_pd || !core_pd || !per_pd || !cam_pd)
return -ENODEV; return -ENODEV;
if (cpuidle_register_driver(&omap3_idle_driver)) { return cpuidle_register(&omap3_idle_driver, NULL);
pr_err("%s: CPUidle driver register failed\n", __func__);
return -EIO;
}
dev = &per_cpu(omap3_idle_dev, smp_processor_id());
dev->cpu = 0;
if (cpuidle_register_device(dev)) {
printk(KERN_ERR "%s: CPUidle register device failed\n",
__func__);
cpuidle_unregister_driver(&omap3_idle_driver);
return -EIO;
}
return 0;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册