| Message ID | 1365770165-27096-11-git-send-email-daniel.lezcano@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/12/2013 02:35 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> > --- Kim, Ben, is it possible you ack this patch if you are ok with it ? So it can go into the linux-pm tree before the merge windows [1] Thanks ! -- Daniel [1] http://www.spinics.net/lists/linux-acpi/msg43138.html > arch/arm/mach-s3c64xx/cpuidle.c | 14 +------------- > 1 file changed, 1 insertion(+), 13 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c > index 852ff16..3c8ab07 100644 > --- a/arch/arm/mach-s3c64xx/cpuidle.c > +++ b/arch/arm/mach-s3c64xx/cpuidle.c > @@ -40,8 +40,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, > return index; > } > > -static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device); > - > static struct cpuidle_driver s3c64xx_cpuidle_driver = { > .name = "s3c64xx_cpuidle", > .owner = THIS_MODULE, > @@ -60,16 +58,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = { > > static int __init s3c64xx_init_cpuidle(void) > { > - int ret; > - > - cpuidle_register_driver(&s3c64xx_cpuidle_driver); > - > - ret = cpuidle_register_device(&s3c64xx_cpuidle_device); > - if (ret) { > - pr_err("Failed to register cpuidle device: %d\n", ret); > - return ret; > - } > - > - return 0; > + return cpuidle_register(&s3c64xx_cpuidle_driver, NULL); > } > device_initcall(s3c64xx_init_cpuidle);
diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c index 852ff16..3c8ab07 100644 --- a/arch/arm/mach-s3c64xx/cpuidle.c +++ b/arch/arm/mach-s3c64xx/cpuidle.c @@ -40,8 +40,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, return index; } -static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device); - static struct cpuidle_driver s3c64xx_cpuidle_driver = { .name = "s3c64xx_cpuidle", .owner = THIS_MODULE, @@ -60,16 +58,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = { static int __init s3c64xx_init_cpuidle(void) { - int ret; - - cpuidle_register_driver(&s3c64xx_cpuidle_driver); - - ret = cpuidle_register_device(&s3c64xx_cpuidle_device); - if (ret) { - pr_err("Failed to register cpuidle device: %d\n", ret); - return ret; - } - - return 0; + return cpuidle_register(&s3c64xx_cpuidle_driver, NULL); } device_initcall(s3c64xx_init_cpuidle);
Remove the duplicated code and use the cpuidle common code for initialization. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-s3c64xx/cpuidle.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)