[V3 patch 08/19] ARM: at91: cpuidle: use init/exit common routine

From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: rjw@sisk.pl
Cc: linus.walleij@linaro.org, jason@lakedaemon.net, andrew@lunn.ch,
	kernel@pengutronix.de, swarren@wwwdotorg.org,
	santosh.shilimkar@ti.com, nicolas.ferre@atmel.com,
	plagnioj@jcrosoft.com, linux@maxim.org.za,
	rob.herring@calxeda.com, nsekhar@ti.com, horms@verge.net.au,
	magnus.damm@gmail.com, deepthi@linux.vnet.ibm.com,
	lethal@linux-sh.org, jkosina@suse.cz, kgene.kim@samsung.com,
	khilman@deeprootsystems.com, tony@atomide.com,
	linux-pm@vger.kernel.org, patches@linaro.org,
	linux-arm-kernel@lists.infradead.org,
	linaro-kernel@lists.linaro.org, josephl@nvidia.com
Subject: [V3 patch 08/19] ARM: at91: cpuidle: use init/exit common routine
Date: Fri, 12 Apr 2013 14:35:54 +0200	[thread overview]
Message-ID: <1365770165-27096-9-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1365770165-27096-1-git-send-email-daniel.lezcano@linaro.org>

Remove the duplicate code and use the arm cpuidle driver's common code
for initialization.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/mach-at91/cpuidle.c |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
index 0130df7..48f1228 100644
--- a/arch/arm/mach-at91/cpuidle.c
+++ b/arch/arm/mach-at91/cpuidle.c
@@ -27,8 +27,6 @@
 
 #define AT91_MAX_STATES	2
 
-static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device);
-
 /* Actual code that puts the SoC in different idle states */
 static int at91_enter_idle(struct cpuidle_device *dev,
 			struct cpuidle_driver *drv,
@@ -60,20 +58,9 @@ static struct cpuidle_driver at91_idle_driver = {
 };
 
 /* Initialize CPU idle by registering the idle states */
-static int at91_init_cpuidle(void)
+static int __init at91_init_cpuidle(void)
 {
-	struct cpuidle_device *device;
-
-	device = &per_cpu(at91_cpuidle_device, smp_processor_id());
-	device->state_count = AT91_MAX_STATES;
-
-	cpuidle_register_driver(&at91_idle_driver);
-
-	if (cpuidle_register_device(device)) {
-		printk(KERN_ERR "at91_init_cpuidle: Failed registering\n");
-		return -EIO;
-	}
-	return 0;
+	return cpuidle_register(&at91_idle_driver, NULL);
 }
 
 device_initcall(at91_init_cpuidle);
-- 
1.7.9.5

