| Message ID | 1365770165-27096-14-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Friday 12 April 2013 06:05 PM, Daniel Lezcano wrote: > Remove the duplicated code and use the cpuidle common code for initialization. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Daniel Lezcano <daniel.lezcano@linaro.org> writes: > Remove the duplicated code and use the cpuidle common code for initialization. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Kevin Hilman <khilman@linaro.org> > --- > arch/arm/mach-omap2/cpuidle44xx.c | 22 ++-------------------- > 1 file changed, 2 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c > index cd188de..861dd90 100644 > --- a/arch/arm/mach-omap2/cpuidle44xx.c > +++ b/arch/arm/mach-omap2/cpuidle44xx.c > @@ -15,6 +15,7 @@ > #include <linux/cpu_pm.h> > #include <linux/export.h> > > +#include <asm/cpuidle.h> > #include <asm/proc-fns.h> > > #include "common.h" > @@ -157,8 +158,6 @@ fail: > return index; > } > > -static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); > - > static struct cpuidle_driver omap4_idle_driver = { > .name = "omap4_idle", > .owner = THIS_MODULE, > @@ -207,9 +206,6 @@ static struct cpuidle_driver omap4_idle_driver = { > */ > int __init omap4_idle_init(void) > { > - struct cpuidle_device *dev; > - unsigned int cpu_id = 0; > - > mpu_pd = pwrdm_lookup("mpu_pwrdm"); > cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm"); > cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm"); > @@ -221,19 +217,5 @@ int __init omap4_idle_init(void) > if (!cpu_clkdm[0] || !cpu_clkdm[1]) > return -ENODEV; > > - for_each_cpu(cpu_id, cpu_online_mask) { > - dev = &per_cpu(omap4_idle_dev, cpu_id); > - dev->cpu = cpu_id; > -#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED > - dev->coupled_cpus = *cpu_online_mask; > -#endif > - cpuidle_register_driver(&omap4_idle_driver); > - > - if (cpuidle_register_device(dev)) { > - pr_err("%s: CPUidle register failed\n", __func__); > - return -EIO; > - } > - } > - > - return 0; > + return cpuidle_register(&omap4_idle_driver, cpu_online_mask); > }
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index cd188de..861dd90 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -15,6 +15,7 @@ #include <linux/cpu_pm.h> #include <linux/export.h> +#include <asm/cpuidle.h> #include <asm/proc-fns.h> #include "common.h" @@ -157,8 +158,6 @@ fail: return index; } -static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); - static struct cpuidle_driver omap4_idle_driver = { .name = "omap4_idle", .owner = THIS_MODULE, @@ -207,9 +206,6 @@ static struct cpuidle_driver omap4_idle_driver = { */ int __init omap4_idle_init(void) { - struct cpuidle_device *dev; - unsigned int cpu_id = 0; - mpu_pd = pwrdm_lookup("mpu_pwrdm"); cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm"); cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm"); @@ -221,19 +217,5 @@ int __init omap4_idle_init(void) if (!cpu_clkdm[0] || !cpu_clkdm[1]) return -ENODEV; - for_each_cpu(cpu_id, cpu_online_mask) { - dev = &per_cpu(omap4_idle_dev, cpu_id); - dev->cpu = cpu_id; -#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED - dev->coupled_cpus = *cpu_online_mask; -#endif - cpuidle_register_driver(&omap4_idle_driver); - - if (cpuidle_register_device(dev)) { - pr_err("%s: CPUidle register failed\n", __func__); - return -EIO; - } - } - - return 0; + return cpuidle_register(&omap4_idle_driver, cpu_online_mask); }
Remove the duplicated code and use the cpuidle common code for initialization. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-omap2/cpuidle44xx.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-)