Skip to content

Commit

Permalink
Replace the flag by a simple global boolean in the cpuidle.c.
Browse files Browse the repository at this point in the history
That will allow to cleanup the rest of the code right after,
because the ops won't make sense.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Daniel Lezcano authored and Len Brown committed Feb 8, 2013
1 parent 88b62b9 commit 5af4a21
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions arch/arm/mach-davinci/cpuidle.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#define DAVINCI_CPUIDLE_MAX_STATES 2

struct davinci_ops {
void (*enter) (u32 flags);
void (*exit) (u32 flags);
void (*enter) (void);
void (*exit) (void);
u32 flags;
};

Expand All @@ -40,20 +40,17 @@ static int davinci_enter_idle(struct cpuidle_device *dev,
struct davinci_ops *ops = cpuidle_get_statedata(state_usage);

if (ops && ops->enter)
ops->enter(ops->flags);
ops->enter();

index = cpuidle_wrap_enter(dev, drv, index,
arm_cpuidle_simple_enter);

if (ops && ops->exit)
ops->exit(ops->flags);
ops->exit();

return index;
}

/* fields in davinci_ops.flags */
#define DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN BIT(0)

static struct cpuidle_driver davinci_idle_driver = {
.name = "cpuidle-davinci",
.owner = THIS_MODULE,
Expand All @@ -72,6 +69,7 @@ static struct cpuidle_driver davinci_idle_driver = {

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

static void davinci_save_ddr_power(int enter, bool pdown)
{
Expand All @@ -92,14 +90,14 @@ static void davinci_save_ddr_power(int enter, bool pdown)
__raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
}

static void davinci_c2state_enter(u32 flags)
static void davinci_c2state_enter(void)
{
davinci_save_ddr_power(1, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN));
davinci_save_ddr_power(1, ddr2_pdown);
}

static void davinci_c2state_exit(u32 flags)
static void davinci_c2state_exit(void)
{
davinci_save_ddr_power(0, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN));
davinci_save_ddr_power(0, ddr2_pdown);
}

static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = {
Expand All @@ -124,8 +122,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)

ddr2_reg_base = pdata->ddr2_ctlr_base;

if (pdata->ddr2_pdown)
davinci_states[1].flags |= DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN;
ddr2_pdown = pdata->ddr2_pdown;
cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);

device->state_count = DAVINCI_CPUIDLE_MAX_STATES;
Expand Down

0 comments on commit 5af4a21

Please sign in to comment.