[PATCH 4/5] OMAP3: cpuidle: code rework for improved readability

[Kevin Hilman]

jean.pihet at newoldbits.com writes:

> From: Jean Pihet <j-pihet at ti.com>

Please summarize changes here.

Kevin

> Signed-off-by: Jean Pihet <j-pihet at ti.com>
> ---
>  arch/arm/mach-omap2/cpuidle34xx.c |   52 +++++++++++++-----------------------
>  1 files changed, 19 insertions(+), 33 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
> index f84315c..4673cc6 100644
> --- a/arch/arm/mach-omap2/cpuidle34xx.c
> +++ b/arch/arm/mach-omap2/cpuidle34xx.c
> @@ -80,13 +80,6 @@ static struct cpuidle_params cpuidle_params_table[OMAP3_MAX_STATES] = {
>  	{10000 + 30000, 300000, 1},
>  };
>  
> -static int omap3_idle_bm_check(void)
> -{
> -	if (!omap3_can_sleep())
> -		return 1;
> -	return 0;
> -}
> -
>  static int _cpuidle_allow_idle(struct powerdomain *pwrdm,
>  				struct clockdomain *clkdm)
>  {
> @@ -166,9 +159,7 @@ static struct cpuidle_state *next_valid_state(struct cpuidle_device *dev,
>  					      struct cpuidle_state *curr)
>  {
>  	struct cpuidle_state *next = NULL;
> -	struct omap3_idle_statedata *cx;
> -
> -	cx = cpuidle_get_statedata(curr);
> +	struct omap3_idle_statedata *cx = cpuidle_get_statedata(curr);
>  
>  	/* Check if current state is valid */
>  	if (cx->valid) {
> @@ -176,9 +167,7 @@ static struct cpuidle_state *next_valid_state(struct cpuidle_device *dev,
>  	} else {
>  		u8 idx = OMAP3_STATE_MAX;
>  
> -		/*
> -		 * Reach the current state starting at highest C-state
> -		 */
> +		/* Reach the current state starting at highest C-state */
>  		for (; idx >= OMAP3_STATE_C1; idx--) {
>  			if (&dev->states[idx] == curr) {
>  				next = &dev->states[idx];
> @@ -186,9 +175,7 @@ static struct cpuidle_state *next_valid_state(struct cpuidle_device *dev,
>  			}
>  		}
>  
> -		/*
> -		 * Should never hit this condition.
> -		 */
> +		/* Should never hit this condition */
>  		WARN_ON(next == NULL);
>  
>  		/*
> @@ -223,29 +210,16 @@ static struct cpuidle_state *next_valid_state(struct cpuidle_device *dev,
>  static int omap3_enter_idle_bm(struct cpuidle_device *dev,
>  			       struct cpuidle_state *state)
>  {
> -	struct cpuidle_state *new_state = next_valid_state(dev, state);
> -	u32 core_next_state, per_next_state = 0, per_saved_state = 0;
> -	u32 cam_state;
> +	struct cpuidle_state *new_state;
> +	u32 core_next_state, per_next_state = 0, per_saved_state = 0, cam_state;
>  	struct omap3_idle_statedata *cx;
>  	int ret;
>  
> -	if (omap3_idle_bm_check()) {
> -		BUG_ON(!dev->safe_state);
> +	if (!omap3_can_sleep()) {
>  		new_state = dev->safe_state;
>  		goto select_state;
>  	}
>  
> -	cx = cpuidle_get_statedata(state);
> -	core_next_state = cx->core_state;
> -
> -	/*
> -	 * FIXME: we currently manage device-specific idle states
> -	 *        for PER and CORE in combination with CPU-specific
> -	 *        idle states.  This is wrong, and device-specific
> -	 *        idle management needs to be separated out into 
> -	 *        its own code.
> -	 */
> -
>  	/*
>  	 * Prevent idle completely if CAM is active.
>  	 * CAM does not have wakeup capability in OMAP3.
> @@ -257,9 +231,19 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
>  	}
>  
>  	/*
> +	 * FIXME: we currently manage device-specific idle states
> +	 *        for PER and CORE in combination with CPU-specific
> +	 *        idle states.  This is wrong, and device-specific
> +	 *        idle management needs to be separated out into
> +	 *        its own code.
> +	 */
> +
> +	/*
>  	 * Prevent PER off if CORE is not in retention or off as this
>  	 * would disable PER wakeups completely.
>  	 */
> +	cx = cpuidle_get_statedata(state);
> +	core_next_state = cx->core_state;
>  	per_next_state = per_saved_state = pwrdm_read_next_pwrst(per_pd);
>  	if ((per_next_state == PWRDM_POWER_OFF) &&
>  	    (core_next_state > PWRDM_POWER_RET))
> @@ -269,6 +253,8 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
>  	if (per_next_state != per_saved_state)
>  		pwrdm_set_next_pwrst(per_pd, per_next_state);
>  
> +	new_state = next_valid_state(dev, state);
> +
>  select_state:
>  	dev->last_state = new_state;
>  	ret = omap3_enter_idle(dev, new_state);
> @@ -329,7 +315,7 @@ struct cpuidle_driver omap3_idle_driver = {
>  	.owner = 	THIS_MODULE,
>  };
>  
> -/* Fill in the state data from the mach tables and register the driver_data */
> +/* Helper to fill the C-state common data and register the driver_data */
>  #define FILL_IN_STATE(idx, descr)					\
>  do {									\
>  	state				= &dev->states[count];		\