From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754082AbaESMWh (ORCPT <rfc822;w@1wt.eu>);
	Mon, 19 May 2014 08:22:37 -0400
Received: from devils.ext.ti.com ([198.47.26.153]:36944 "EHLO
	devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752866AbaESMWg (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 19 May 2014 08:22:36 -0400
Message-ID: <5379F7AE.2040806@ti.com>
Date: Mon, 19 May 2014 15:23:10 +0300
From: Tero Kristo <t-kristo@ti.com>
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.4.0
MIME-Version: 1.0
To: Julia Lawall <julia.lawall@lip6.fr>
CC: Dan Carpenter <dan.carpenter@oracle.com>,
        Mike Turquette <mturquette@linaro.org>,
        <kernel-janitors@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        J Keerthy <j-keerthy@ti.com>
Subject: Re: [PATCH] CLK: TI: DRA7: return error code in failure case
References: <1400473875-22228-1-git-send-email-Julia.Lawall@lip6.fr> <1400473875-22228-4-git-send-email-Julia.Lawall@lip6.fr> <20140519074155.GO15585@mwanda> <5379BC0C.3070401@ti.com> <alpine.DEB.2.10.1405191924330.2564@hadrien>
In-Reply-To: <alpine.DEB.2.10.1405191924330.2564@hadrien>
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 05/19/2014 02:25 PM, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Add a returned error code in the MAX_APLL_WAIT_TRIES case.  Remove the
> updating of the return variable r to 0 if MAX_APLL_WAIT_TRIES is not yet
> reached, because r is already 0 at this point.
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

Acked-by: Tero Kristo <t-kristo@ti.com>

Mike, do you want to queue this as a fix or shall I add this to be 
queued for 3.16?

-Tero

>
> ---
> diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c
> index b986f61..efc71a0 100644
> --- a/drivers/clk/ti/apll.c
> +++ b/drivers/clk/ti/apll.c
> @@ -77,13 +77,11 @@ static int dra7_apll_enable(struct clk_hw *hw)
>   	if (i == MAX_APLL_WAIT_TRIES) {
>   		pr_warn("clock: %s failed transition to '%s'\n",
>   			clk_name, (state) ? "locked" : "bypassed");
> -	} else {
> +		r = -EBUSY;
> +	} else
>   		pr_debug("clock: %s transition to '%s' in %d loops\n",
>   			 clk_name, (state) ? "locked" : "bypassed", i);
>
> -		r = 0;
> -	}
> -
>   	return r;
>   }
>