Skip to content

Commit

Permalink
ARM: davinci: cpuidle: use init/exit common routine
Browse files Browse the repository at this point in the history
Remove the duplicated code and use the cpuidle common code for initialization.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Daniel Lezcano authored and Rafael J. Wysocki committed Apr 23, 2013
1 parent 30dc72c commit 3aec034
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions arch/arm/mach-davinci/cpuidle.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

#define DAVINCI_CPUIDLE_MAX_STATES 2

static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);
static void __iomem *ddr2_reg_base;
static bool ddr2_pdown;

Expand Down Expand Up @@ -76,12 +75,8 @@ static struct cpuidle_driver davinci_idle_driver = {

static int __init davinci_cpuidle_probe(struct platform_device *pdev)
{
int ret;
struct cpuidle_device *device;
struct davinci_cpuidle_config *pdata = pdev->dev.platform_data;

device = &per_cpu(davinci_cpuidle_device, smp_processor_id());

if (!pdata) {
dev_err(&pdev->dev, "cannot get platform data\n");
return -ENOENT;
Expand All @@ -91,20 +86,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)

ddr2_pdown = pdata->ddr2_pdown;

ret = cpuidle_register_driver(&davinci_idle_driver);
if (ret) {
dev_err(&pdev->dev, "failed to register driver\n");
return ret;
}

ret = cpuidle_register_device(device);
if (ret) {
dev_err(&pdev->dev, "failed to register device\n");
cpuidle_unregister_driver(&davinci_idle_driver);
return ret;
}

return 0;
return cpuidle_register(&davinci_idle_driver, NULL);
}

static struct platform_driver davinci_cpuidle_driver = {
Expand Down

0 comments on commit 3aec034

Please sign in to comment.