| Message ID | 1364234140-514-15-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Mon, Mar 25, 2013 at 06:55:39PM +0100, Daniel Lezcano wrote: > Remove the shmobile_enter_wfi function which is the same as the > common WFI enter function from the arm cpuidle driver defined > with the ARM_CPUIDLE_WFI_STATE macro. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/cpuidle.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c > index 068f9ca..c872ae8 100644 > --- a/arch/arm/mach-shmobile/cpuidle.c > +++ b/arch/arm/mach-shmobile/cpuidle.c > @@ -16,20 +16,12 @@ > #include <asm/cpuidle.h> > #include <asm/io.h> > > -int shmobile_enter_wfi(struct cpuidle_device *dev, struct cpuidle_driver *drv, > - int index) > -{ > - cpu_do_idle(); > - return 0; > -} > - > static struct cpuidle_device shmobile_cpuidle_dev; > static struct cpuidle_driver shmobile_cpuidle_default_driver = { > .name = "shmobile_cpuidle", > .owner = THIS_MODULE, > .en_core_tk_irqen = 1, > .states[0] = ARM_CPUIDLE_WFI_STATE, > - .states[0].enter = shmobile_enter_wfi, > .safe_state_index = 0, /* C1 */ > .state_count = 1, > }; > -- > 1.7.9.5 >
diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c index 068f9ca..c872ae8 100644 --- a/arch/arm/mach-shmobile/cpuidle.c +++ b/arch/arm/mach-shmobile/cpuidle.c @@ -16,20 +16,12 @@ #include <asm/cpuidle.h> #include <asm/io.h> -int shmobile_enter_wfi(struct cpuidle_device *dev, struct cpuidle_driver *drv, - int index) -{ - cpu_do_idle(); - return 0; -} - static struct cpuidle_device shmobile_cpuidle_dev; static struct cpuidle_driver shmobile_cpuidle_default_driver = { .name = "shmobile_cpuidle", .owner = THIS_MODULE, .en_core_tk_irqen = 1, .states[0] = ARM_CPUIDLE_WFI_STATE, - .states[0].enter = shmobile_enter_wfi, .safe_state_index = 0, /* C1 */ .state_count = 1, };
Remove the shmobile_enter_wfi function which is the same as the common WFI enter function from the arm cpuidle driver defined with the ARM_CPUIDLE_WFI_STATE macro. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-shmobile/cpuidle.c | 8 -------- 1 file changed, 8 deletions(-)