From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Fri, 12 Apr 2013 12:35:47 +0000 (+0000)
Subject: ARM: shmobile: cpuidle: remove shmobile_enter_wfi function
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=38ef8d3fa4a67c07bdfd640833a88baf525f955b;p=deliverable%2Flinux.git

ARM: shmobile: cpuidle: remove shmobile_enter_wfi function

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>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index f6b14cac0076..fbef7b933c1d 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",