From: andrew@lunn.ch (Andrew Lunn) Date: Sun, 14 Apr 2013 17:14:29 +0200 Subject: [V3 patch 17/19] ARM: kirkwood: cpuidle: use init/exit common routine In-Reply-To: <1365770165-27096-18-git-send-email-daniel.lezcano@linaro.org> References: <1365770165-27096-1-git-send-email-daniel.lezcano@linaro.org> <1365770165-27096-18-git-send-email-daniel.lezcano@linaro.org> Message-ID: <20130414151429.GF5061@lunn.ch> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Apr 12, 2013 at 02:36:03PM +0200, Daniel Lezcano wrote: > Remove the duplicated code and use the cpuidle common code for initialization. > > Signed-off-by: Daniel Lezcano > --- > drivers/cpuidle/cpuidle-kirkwood.c | 17 ++--------------- > 1 file changed, 2 insertions(+), 15 deletions(-) > > diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c > index 6f31524..53290e1 100644 > --- a/drivers/cpuidle/cpuidle-kirkwood.c > +++ b/drivers/cpuidle/cpuidle-kirkwood.c > @@ -52,9 +52,6 @@ static struct cpuidle_driver kirkwood_idle_driver = { > }, > .state_count = KIRKWOOD_MAX_STATES, > }; > -static struct cpuidle_device *device; > - > -static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device); > > /* Initialize CPU idle by registering the idle states */ > static int kirkwood_cpuidle_probe(struct platform_device *pdev) > @@ -69,22 +66,12 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev) > if (IS_ERR(ddr_operation_base)) > return PTR_ERR(ddr_operation_base); > > - device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id()); > - device->state_count = KIRKWOOD_MAX_STATES; > - > - cpuidle_register_driver(&kirkwood_idle_driver); > - if (cpuidle_register_device(device)) { > - pr_err("kirkwood_init_cpuidle: Failed registering\n"); > - return -EIO; > - } > - return 0; > + return cpuidle_register(&kirkwood_idle_driver, NULL); > } > > int kirkwood_cpuidle_remove(struct platform_device *pdev) > { > - cpuidle_unregister_device(device); > - cpuidle_unregister_driver(&kirkwood_idle_driver); > - > + cpuidle_unregister(&kirkwood_idle_driver); > return 0; > } > > -- > 1.7.9.5 > Tested-by: Andrew Lunn