| Message ID | 1365770165-27096-3-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | Accepted |
| Commit | 80d538b2754f1eed85296f0c7088f7157d543f89 |
| Headers | show |
On Fri, Apr 12, 2013 at 02:35:48PM +0200, Daniel Lezcano wrote: > Commit 688036b538974de32ce55be8b0e013b003992abc removed the function > 'shmobile_enter_wfi' but we forgot to remove the definition in the header file. > > Note this function is just an alias to 'cpu_do_idle()' wrapped into a cpuidle > function callback prototype which already exists with the default WFI state > and the arm_simple_enter function. > > Remove the function prototype. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/include/mach/common.h | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h > index e48606d..362f9b2 100644 > --- a/arch/arm/mach-shmobile/include/mach/common.h > +++ b/arch/arm/mach-shmobile/include/mach/common.h > @@ -13,9 +13,6 @@ extern int shmobile_clk_init(void); > extern void shmobile_handle_irq_intc(struct pt_regs *); > extern struct platform_suspend_ops shmobile_suspend_ops; > struct cpuidle_driver; > -struct cpuidle_device; > -extern int shmobile_enter_wfi(struct cpuidle_device *dev, > - struct cpuidle_driver *drv, int index); > extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv); > > extern void sh7372_init_irq(void); > -- > 1.7.9.5 >
On Friday 12 April 2013 06:05 PM, Daniel Lezcano wrote: > Commit 688036b538974de32ce55be8b0e013b003992abc removed the function > 'shmobile_enter_wfi' but we forgot to remove the definition in the header file. > > Note this function is just an alias to 'cpu_do_idle()' wrapped into a cpuidle > function callback prototype which already exists with the default WFI state > and the arm_simple_enter function. > > Remove the function prototype. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- You can actually fold this into 1/19. No strong opinion though.
On 04/18/2013 10:30 AM, Santosh Shilimkar wrote: > On Friday 12 April 2013 06:05 PM, Daniel Lezcano wrote: >> Commit 688036b538974de32ce55be8b0e013b003992abc removed the function >> 'shmobile_enter_wfi' but we forgot to remove the definition in the header file. >> >> Note this function is just an alias to 'cpu_do_idle()' wrapped into a cpuidle >> function callback prototype which already exists with the default WFI state >> and the arm_simple_enter function. >> >> Remove the function prototype. >> >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> >> --- > You can actually fold this into 1/19. No strong opinion though. Initially it was folded but Simon wanted to split it in two, thus 1/19 and 2/19.
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index e48606d..362f9b2 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -13,9 +13,6 @@ extern int shmobile_clk_init(void); extern void shmobile_handle_irq_intc(struct pt_regs *); extern struct platform_suspend_ops shmobile_suspend_ops; struct cpuidle_driver; -struct cpuidle_device; -extern int shmobile_enter_wfi(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index); extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv); extern void sh7372_init_irq(void);
Commit 688036b538974de32ce55be8b0e013b003992abc removed the function 'shmobile_enter_wfi' but we forgot to remove the definition in the header file. Note this function is just an alias to 'cpu_do_idle()' wrapped into a cpuidle function callback prototype which already exists with the default WFI state and the arm_simple_enter function. Remove the function prototype. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-shmobile/include/mach/common.h | 3 --- 1 file changed, 3 deletions(-)