diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-09-12 19:55:40 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-09-18 11:14:42 +0200 |
commit | e8bbaeac25503aaaf215e9cc4b278890e043410b (patch) | |
tree | 7f5f2a75270a1bc4c29d06a25351ec86a7efd778 /drivers/tty/serial/8250/8250_aspeed_vuart.c | |
parent | 2ff477b78250186e611e008320e1de20107e9617 (diff) | |
download | linux-e8bbaeac25503aaaf215e9cc4b278890e043410b.tar.gz linux-e8bbaeac25503aaaf215e9cc4b278890e043410b.tar.bz2 linux-e8bbaeac25503aaaf215e9cc4b278890e043410b.zip |
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230912165540.402504-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_aspeed_vuart.c')
-rw-r--r-- | drivers/tty/serial/8250/8250_aspeed_vuart.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/tty/serial/8250/8250_aspeed_vuart.c b/drivers/tty/serial/8250/8250_aspeed_vuart.c index 4a9e71b2dbbc..7a4537a1d66c 100644 --- a/drivers/tty/serial/8250/8250_aspeed_vuart.c +++ b/drivers/tty/serial/8250/8250_aspeed_vuart.c @@ -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, - "clk or clock-frequency not defined\n"); - rc = PTR_ERR(vuart->clk); + rc = dev_err_probe(dev, PTR_ERR(vuart->clk), + "clk or clock-frequency not defined\n"); 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; } |