Commit e8bbaeac authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: 8250_aspeed_vuart: Use dev_err_probe() instead of dev_err() 



The probe process may generate EPROBE_DEFER. In this case
dev_err_probe() can still record err information. Otherwise
it may pollute logs on that occasion.

This also helps simplifing code and standardizing the error output.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230912165540.402504-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ff477b7

drivers/tty/serial/8250/8250_aspeed_vuart.c

+7 −7
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ static int aspeed_vuart_map_irq_polarity(u32 dt) 
static int aspeed_vuart_probe(struct platform_device *pdev)

{

	struct of_phandle_args sirq_polarity_sense_args;

	struct device *dev = &pdev->dev;

	struct uart_8250_port port;

	struct aspeed_vuart *vuart;

	struct device_node *np;
@@ -455,9 +456,8 @@ static int aspeed_vuart_probe(struct platform_device *pdev) 
	if (of_property_read_u32(np, "clock-frequency", &clk)) {

		vuart->clk = devm_clk_get(&pdev->dev, NULL);

		if (IS_ERR(vuart->clk)) {

			dev_warn(&pdev->dev,

			rc = dev_err_probe(dev, PTR_ERR(vuart->clk),

					   "clk or clock-frequency not defined\n");

			rc = PTR_ERR(vuart->clk);

			goto err_sysfs_remove;

		}
@@ -533,7 +533,7 @@ static int aspeed_vuart_probe(struct platform_device *pdev) 


	rc = aspeed_vuart_set_lpc_address(vuart, prop);

	if (rc < 0) {

		dev_err(&pdev->dev, "invalid value in aspeed,lpc-io-reg property\n");

		dev_err_probe(dev, rc, "invalid value in aspeed,lpc-io-reg property\n");

		goto err_clk_disable;

	}
@@ -545,14 +545,14 @@ static int aspeed_vuart_probe(struct platform_device *pdev) 


	rc = aspeed_vuart_set_sirq(vuart, sirq[0]);

	if (rc < 0) {

		dev_err(&pdev->dev, "invalid sirq number in aspeed,lpc-interrupts property\n");

		dev_err_probe(dev, rc, "invalid sirq number in aspeed,lpc-interrupts property\n");

		goto err_clk_disable;

	}



	sirq_polarity = aspeed_vuart_map_irq_polarity(sirq[1]);

	if (sirq_polarity < 0) {

		dev_err(&pdev->dev, "invalid sirq polarity in aspeed,lpc-interrupts property\n");

		rc = sirq_polarity;

		rc = dev_err_probe(dev, sirq_polarity,

				   "invalid sirq polarity in aspeed,lpc-interrupts property\n");

		goto err_clk_disable;

	}