Commit 36ce8d4f authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Len Brown

davinci: cpuidle - remove the ops

With one function handling the idle state and a single variable,
the usage of the davinci_ops is overkill.

This patch removes these ops and simplify the code.

Furthermore, the 'driver_data' field is no longer used, we have
1 of the 3 remaining user of this field removed.
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8d60143a
...@@ -25,12 +25,6 @@ ...@@ -25,12 +25,6 @@
#define DAVINCI_CPUIDLE_MAX_STATES 2 #define DAVINCI_CPUIDLE_MAX_STATES 2
struct davinci_ops {
void (*enter) (void);
void (*exit) (void);
u32 flags;
};
static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device); static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);
static void __iomem *ddr2_reg_base; static void __iomem *ddr2_reg_base;
static bool ddr2_pdown; static bool ddr2_pdown;
...@@ -54,39 +48,17 @@ static void davinci_save_ddr_power(int enter, bool pdown) ...@@ -54,39 +48,17 @@ static void davinci_save_ddr_power(int enter, bool pdown)
__raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET); __raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
} }
static void davinci_c2state_enter(void)
{
davinci_save_ddr_power(1, ddr2_pdown);
}
static void davinci_c2state_exit(void)
{
davinci_save_ddr_power(0, ddr2_pdown);
}
static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = {
[1] = {
.enter = davinci_c2state_enter,
.exit = davinci_c2state_exit,
},
};
/* Actual code that puts the SoC in different idle states */ /* Actual code that puts the SoC in different idle states */
static int davinci_enter_idle(struct cpuidle_device *dev, static int davinci_enter_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv, struct cpuidle_driver *drv,
int index) int index)
{ {
struct cpuidle_state_usage *state_usage = &dev->states_usage[index]; davinci_save_ddr_power(1, ddr2_pdown);
struct davinci_ops *ops = cpuidle_get_statedata(state_usage);
if (ops && ops->enter)
ops->enter();
index = cpuidle_wrap_enter(dev, drv, index, index = cpuidle_wrap_enter(dev, drv, index,
arm_cpuidle_simple_enter); arm_cpuidle_simple_enter);
if (ops && ops->exit) davinci_save_ddr_power(0, ddr2_pdown);
ops->exit();
return index; return index;
} }
...@@ -123,7 +95,6 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev) ...@@ -123,7 +95,6 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)
ddr2_reg_base = pdata->ddr2_ctlr_base; ddr2_reg_base = pdata->ddr2_ctlr_base;
ddr2_pdown = pdata->ddr2_pdown; ddr2_pdown = pdata->ddr2_pdown;
cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);
device->state_count = DAVINCI_CPUIDLE_MAX_STATES; device->state_count = DAVINCI_CPUIDLE_MAX_STATES;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment