[PATCH 1/2] omap2+: pm: Use if...else instead of goto

[Santosh Shilimkar]

On 6/24/2011 4:05 PM, Sanjeev Premi wrote:
> This patch replaces the use of goto with simple
> if...else syntax. No change in functionality.
>
> This also means that the comment describing the
> dependency between CONFIG_SMP and calculation
> of loops_per_jiffy can be unified.
>
> Signed-off-by: Sanjeev Premi<premi at ti.com>
> ---
Don't see need of this patch as well considering your second patch.
So NAK.

>   arch/arm/mach-omap2/omap2plus-cpufreq.c |   59 +++++++++++++-----------------
>   1 files changed, 26 insertions(+), 33 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c
> index 1f3b2e1..ce9d534 100644
> --- a/arch/arm/mach-omap2/omap2plus-cpufreq.c
> +++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c
> @@ -96,57 +96,50 @@ static int omap_target(struct cpufreq_policy *policy,
>   	if (freqs.old == freqs.new&&  policy->cur == freqs.new)
>   		return ret;
>
> -	if (!is_smp()) {
> -		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
> -		goto set_freq;
> -	}
> -
> -	/* notifiers */
> -	for_each_cpu(i, policy->cpus) {
> -		freqs.cpu = i;
> +	/* Notify transitions */
> +	if (is_smp()) {
> +		for_each_cpu(i, policy->cpus) {
> +			freqs.cpu = i;
> +			cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
> +		}
> +	} else {
>   		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
>   	}
>
> -set_freq:
>   #ifdef CONFIG_CPU_FREQ_DEBUG
>   	pr_info("cpufreq-omap: transition: %u -->  %u\n", freqs.old, freqs.new);
>   #endif
>
>   	ret = clk_set_rate(mpu_clk, freqs.new * 1000);
>
> -	/*
> -	 * Generic CPUFREQ driver jiffy update is under !SMP. So jiffies
> -	 * won't get updated when UP machine cpufreq build with
> -	 * CONFIG_SMP enabled. Below code is added only to manage that
> -	 * scenario
> -	 */
>   	freqs.new = omap_getspeed(policy->cpu);
> -	if (!is_smp()) {
> -		loops_per_jiffy =
> -			 cpufreq_scale(loops_per_jiffy, freqs.old, freqs.new);
> -		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
> -		goto skip_lpj;
> -	}
>
> -#ifdef CONFIG_SMP
>   	/*
> -	 * Note that loops_per_jiffy is not updated on SMP systems in
> -	 * cpufreq driver. So, update the per-CPU loops_per_jiffy value
> -	 * on frequency transition. We need to update all dependent CPUs.
> +	 * In the generic cpufreq driver jiffies are updated only for
> +	 * non-SMP cases. Ensure that jiffies are bing updated for both
> +	 * SMP systems and UP systems built with CONFIG_SMP enabled.
>   	 */
> -	for_each_cpu(i, policy->cpus)
> -		per_cpu(cpu_data, i).loops_per_jiffy =
> -			cpufreq_scale(per_cpu(cpu_data, i).loops_per_jiffy,
> -					freqs.old, freqs.new);
> +	if (is_smp()) {
> +#ifdef CONFIG_SMP
> +		for_each_cpu(i, policy->cpus)
> +			per_cpu(cpu_data, i).loops_per_jiffy =
> +				cpufreq_scale(per_cpu(cpu_data, i).loops_per_jiffy,
> +						freqs.old,
> +						freqs.new);
>   #endif
> +		/* Notify transitions */
> +		for_each_cpu(i, policy->cpus) {
> +			freqs.cpu = i;
> +			cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
> +		}
> +	} else {
> +		loops_per_jiffy = cpufreq_scale(loops_per_jiffy,
> +					freqs.old, freqs.new);
>
> -	/* notifiers */
> -	for_each_cpu(i, policy->cpus) {
> -		freqs.cpu = i;
> +		/* Notify transitions */
>   		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
>   	}
>
> -skip_lpj:
>   	return ret;
>   }
>