[PATCH 4/8] powerpc/perf: Use existing out label in power_pmu_enable()

Anshuman Khandual khandual at linux.vnet.ibm.com
Thu Jun 27 21:01:55 EST 2013


On 06/24/2013 04:58 PM, Michael Ellerman wrote:
> In power_pmu_enable() we can use the existing out label to reduce the
> number of return paths.
> 
> Signed-off-by: Michael Ellerman <michael at ellerman.id.au>

Reviewed-by: Anshuman Khandual <khandual at linux.vnet.ibm.com>

> ---
>  arch/powerpc/perf/core-book3s.c |    9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
> index 3d566ee..af4b4b1 100644
> --- a/arch/powerpc/perf/core-book3s.c
> +++ b/arch/powerpc/perf/core-book3s.c
> @@ -919,12 +919,13 @@ static void power_pmu_enable(struct pmu *pmu)
> 
>  	if (!ppmu)
>  		return;
> +
>  	local_irq_save(flags);
> +
>  	cpuhw = &__get_cpu_var(cpu_hw_events);
> -	if (!cpuhw->disabled) {
> -		local_irq_restore(flags);
> -		return;
> -	}
> +	if (!cpuhw->disabled)
> +		goto out;
> +
>  	cpuhw->disabled = 0;
> 
>  	/*
> 



More information about the Linuxppc-dev mailing list