提交 82ca0d54 编写于 作者: G Greg Kroah-Hartman

Revert "tty: xilinx_uartps: Correct return value in probe"

This reverts commit eca42d4c.

During review it was rejected, so drop it from the tree.

Cc: Rajan Vaja <RAJANV@xilinx.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 2f588cee
...@@ -1545,25 +1545,27 @@ static int cdns_uart_probe(struct platform_device *pdev) ...@@ -1545,25 +1545,27 @@ static int cdns_uart_probe(struct platform_device *pdev)
} }
cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "pclk"); cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "pclk");
if (PTR_ERR(cdns_uart_data->pclk) == -EPROBE_DEFER)
return PTR_ERR(cdns_uart_data->pclk);
if (IS_ERR(cdns_uart_data->pclk)) { if (IS_ERR(cdns_uart_data->pclk)) {
cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "aper_clk"); cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "aper_clk");
if (IS_ERR(cdns_uart_data->pclk)) if (!IS_ERR(cdns_uart_data->pclk))
return PTR_ERR(cdns_uart_data->pclk); dev_err(&pdev->dev, "clock name 'aper_clk' is deprecated.\n");
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);
goto err_out_unregister_driver;
} }
cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "uart_clk"); cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "uart_clk");
if (PTR_ERR(cdns_uart_data->uartclk) == -EPROBE_DEFER)
return PTR_ERR(cdns_uart_data->uartclk);
if (IS_ERR(cdns_uart_data->uartclk)) { if (IS_ERR(cdns_uart_data->uartclk)) {
cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "ref_clk"); cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "ref_clk");
if (IS_ERR(cdns_uart_data->uartclk)) if (!IS_ERR(cdns_uart_data->uartclk))
return PTR_ERR(cdns_uart_data->uartclk); dev_err(&pdev->dev, "clock name 'ref_clk' is deprecated.\n");
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;
} }
rc = clk_prepare_enable(cdns_uart_data->pclk); rc = clk_prepare_enable(cdns_uart_data->pclk);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册