[V2,01/19] ARM: shmobile: cpuidle: remove shmobile_enter_wfi function

Message ID 1365712969-7541-2-git-send-email-daniel.lezcano@linaro.org
State New
Headers show

Commit Message

Daniel Lezcano April 11, 2013, 8:42 p.m.
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/include/mach/common.h |    3 ---
 arch/arm/mach-shmobile/pm-sh7372.c           |    1 -
 2 files changed, 4 deletions(-)

Comments

Simon Horman April 12, 2013, 12:44 a.m. | #1
On Thu, Apr 11, 2013 at 10:42:31PM +0200, 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.

Should this patch also make shmobile_enter_wfi static in
arch/arm/mach-shmobile/cpuidle.c ?

Also, I have a slight preference for the patch to be split into two.
1. A patch to remove usage of shmobile_enter_wfi from the sh7372 SoC.
2. A patch to remove shmobile_enter_wfi. from common.h
   (and make it static?).

> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  arch/arm/mach-shmobile/include/mach/common.h |    3 ---
>  arch/arm/mach-shmobile/pm-sh7372.c           |    1 -
>  2 files changed, 4 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);
> diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
> index f6b14ca..fbef7b9 100644
> --- a/arch/arm/mach-shmobile/pm-sh7372.c
> +++ b/arch/arm/mach-shmobile/pm-sh7372.c
> @@ -414,7 +414,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
>  	.state_count		= 5,
>  	.safe_state_index	= 0, /* C1 */
>  	.states[0] = ARM_CPUIDLE_WFI_STATE,
> -	.states[0].enter = shmobile_enter_wfi,
>  	.states[1] = {
>  		.name = "C2",
>  		.desc = "Core Standby Mode",
> -- 
> 1.7.9.5
>
Daniel Lezcano April 12, 2013, 6:47 a.m. | #2
On 04/12/2013 02:44 AM, Simon Horman wrote:
> On Thu, Apr 11, 2013 at 10:42:31PM +0200, 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.
> Should this patch also make shmobile_enter_wfi static in
> arch/arm/mach-shmobile/cpuidle.c ?

Hum, no :)

Actually, the function was removed because it was expected to be not
longer used. I missed the cpuidle driver in the pm-sh7372.c file and the
function declaration in the header file.
> Also, I have a slight preference for the patch to be split into two.
> 1. A patch to remove usage of shmobile_enter_wfi from the sh7372 SoC.
> 2. A patch to remove shmobile_enter_wfi. from common.h
>    (and make it static?).

Ok, regarding my answer above, do you still want two patches for this ?

Thanks
-- Daniel
Simon Horman April 12, 2013, 7:06 a.m. | #3
On 金,  4月 12, 2013 at 08:47:13午前 +0200, Daniel Lezcano wrote:
> On 04/12/2013 02:44 AM, Simon Horman wrote:
> > On Thu, Apr 11, 2013 at 10:42:31PM +0200, 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.
> > Should this patch also make shmobile_enter_wfi static in
> > arch/arm/mach-shmobile/cpuidle.c ?
> 
> Hum, no :)

Ok, that was my other idea :^)

> Actually, the function was removed because it was expected to be not
> longer used. I missed the cpuidle driver in the pm-sh7372.c file and the
> function declaration in the header file.
> > Also, I have a slight preference for the patch to be split into two.
> > 1. A patch to remove usage of shmobile_enter_wfi from the sh7372 SoC.
> > 2. A patch to remove shmobile_enter_wfi. from common.h
> >    (and make it static?).
> 
> Ok, regarding my answer above, do you still want two patches for this ?

Yes please.
Daniel Lezcano April 12, 2013, 7:11 a.m. | #4
On 04/12/2013 09:06 AM, Simon Horman wrote:
> On 金,  4月 12, 2013 at 08:47:13午前 +0200, Daniel Lezcano wrote:
>> On 04/12/2013 02:44 AM, Simon Horman wrote:
>>> On Thu, Apr 11, 2013 at 10:42:31PM +0200, 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.
>>> Should this patch also make shmobile_enter_wfi static in
>>> arch/arm/mach-shmobile/cpuidle.c ?
>>
>> Hum, no :)
> 
> Ok, that was my other idea :^)
> 
>> Actually, the function was removed because it was expected to be not
>> longer used. I missed the cpuidle driver in the pm-sh7372.c file and the
>> function declaration in the header file.
>>> Also, I have a slight preference for the patch to be split into two.
>>> 1. A patch to remove usage of shmobile_enter_wfi from the sh7372 SoC.
>>> 2. A patch to remove shmobile_enter_wfi. from common.h
>>>    (and make it static?).
>>
>> Ok, regarding my answer above, do you still want two patches for this ?
> 
> Yes please.

Ok, thanks for the review.

  -- Daniel

> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Patch

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);
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index f6b14ca..fbef7b9 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -414,7 +414,6 @@  static struct cpuidle_driver sh7372_cpuidle_driver = {
 	.state_count		= 5,
 	.safe_state_index	= 0, /* C1 */
 	.states[0] = ARM_CPUIDLE_WFI_STATE,
-	.states[0].enter = shmobile_enter_wfi,
 	.states[1] = {
 		.name = "C2",
 		.desc = "Core Standby Mode",