linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Simek <michal.simek@xilinx.com>
To: Rajan Vaja <rajan.vaja@xilinx.com>, <gregkh@linuxfoundation.org>,
	<jslaby@suse.com>
Cc: <linux-kernel@vger.kernel.org>, <JOLLYS@xilinx.com>,
	<anirudh@xilinx.com>, <linux-serial@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2] tty: xilinx_uartps: Correct return value in probe
Date: Wed, 6 Mar 2019 13:34:46 +0100	[thread overview]
Message-ID: <0755f963-5f02-d5c7-57e8-d19e3dd2be7f@xilinx.com> (raw)
In-Reply-To: <1551433028-25207-1-git-send-email-rajan.vaja@xilinx.com>

On 01. 03. 19 10:37, Rajan Vaja wrote:
> Existing driver checks for alternate clock if devm_clk_get() fails
> and returns error code for last clock failure. If xilinx_uartps is
> called before clock driver, devm_clk_get() returns -EPROBE_DEFER.
> In this case, probe should not check for alternate clock as main
> clock is already present in DTS and return -EPROBE_DEFER only.
> 
> This patch fixes it by not checking for alternate clock when main
> clock get returns -EPROBE_DEFER.
> 
> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> ---
> Changes in v2:
>   * Handle dynamic port allocation error cases
> ---
>  drivers/tty/serial/xilinx_uartps.c | 32 +++++++++++++++++++-------------
>  1 file changed, 19 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
> index 094f295..f7ae73e 100644
> --- a/drivers/tty/serial/xilinx_uartps.c
> +++ b/drivers/tty/serial/xilinx_uartps.c
> @@ -1547,27 +1547,33 @@ static int cdns_uart_probe(struct platform_device *pdev)
>  	}
>  
>  	cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "pclk");
> +	if (PTR_ERR(cdns_uart_data->pclk) == -EPROBE_DEFER) {
> +		rc = PTR_ERR(cdns_uart_data->pclk);
> +		goto err_out_unregister_driver;
> +	}
> +
>  	if (IS_ERR(cdns_uart_data->pclk)) {
>  		cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "aper_clk");
> -		if (!IS_ERR(cdns_uart_data->pclk))
> -			dev_err(&pdev->dev, "clock name 'aper_clk' is deprecated.\n");
> +		if (IS_ERR(cdns_uart_data->pclk)) {
> +			rc = PTR_ERR(cdns_uart_data->pclk);
> +			goto err_out_unregister_driver;
> +		}
> +		dev_err(&pdev->dev, "clock name 'aper_clk' is deprecated.\n");
>  	}
> -	if (IS_ERR(cdns_uart_data->pclk)) {
> -		dev_err(&pdev->dev, "pclk clock not found.\n");
> -		rc = PTR_ERR(cdns_uart_data->pclk);
> +
> +	cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "uart_clk");
> +	if (PTR_ERR(cdns_uart_data->uartclk) == -EPROBE_DEFER) {
> +		rc = PTR_ERR(cdns_uart_data->uartclk);
>  		goto err_out_unregister_driver;
>  	}
>  
> -	cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "uart_clk");
>  	if (IS_ERR(cdns_uart_data->uartclk)) {
>  		cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "ref_clk");
> -		if (!IS_ERR(cdns_uart_data->uartclk))
> -			dev_err(&pdev->dev, "clock name 'ref_clk' is deprecated.\n");
> -	}
> -	if (IS_ERR(cdns_uart_data->uartclk)) {
> -		dev_err(&pdev->dev, "uart_clk clock not found.\n");
> -		rc = PTR_ERR(cdns_uart_data->uartclk);
> -		goto err_out_unregister_driver;
> +		if (IS_ERR(cdns_uart_data->uartclk)) {
> +			rc = PTR_ERR(cdns_uart_data->uartclk);
> +			goto err_out_unregister_driver;
> +		}
> +		dev_err(&pdev->dev, "clock name 'ref_clk' is deprecated.\n");
>  	}
>  
>  	rc = clk_prepare_enable(cdns_uart_data->pclk);
> 

Reviewed-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

      reply	other threads:[~2019-03-06 12:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-04 12:51 [PATCH] tty: xilinx_uartps: Correct return value in probe Rajan Vaja
2018-12-05 12:53 ` Michal Simek
2019-03-01  9:37 ` [PATCH v2] " Rajan Vaja
2019-03-06 12:34   ` Michal Simek [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0755f963-5f02-d5c7-57e8-d19e3dd2be7f@xilinx.com \
    --to=michal.simek@xilinx.com \
    --cc=JOLLYS@xilinx.com \
    --cc=anirudh@xilinx.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=rajan.vaja@xilinx.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).