Commit 82ca0d54 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f588cee

drivers/tty/serial/xilinx_uartps.c

+14 −12
Original line number Diff line number Diff line
@@ -1545,26 +1545,28 @@ 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)

		return PTR_ERR(cdns_uart_data->pclk);



	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))

			return PTR_ERR(cdns_uart_data->pclk);

		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)) {

		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");

	if (PTR_ERR(cdns_uart_data->uartclk) == -EPROBE_DEFER)

		return PTR_ERR(cdns_uart_data->uartclk);



	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))

			return PTR_ERR(cdns_uart_data->uartclk);

		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;

	}



	rc = clk_prepare_enable(cdns_uart_data->pclk);

	if (rc) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE