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

serial: 8250_of: Use dev_err_probe() instead of dev_warn() 



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/20230912165607.402580-1-andriy.shevchenko@linux.intel.com


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

drivers/tty/serial/8250/8250_of.c

+8 −12
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev, 
			struct of_serial_info *info)

{

	struct resource resource;

	struct device_node *np = ofdev->dev.of_node;

	struct device *dev = &ofdev->dev;

	struct device_node *np = dev->of_node;

	struct uart_port *port = &up->port;

	u32 clk, spd, prop;

	int ret, irq;
@@ -48,10 +49,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev, 
		/* Get clk rate through clk driver if present */

		info->clk = devm_clk_get(&ofdev->dev, NULL);

		if (IS_ERR(info->clk)) {

			ret = PTR_ERR(info->clk);

			if (ret != -EPROBE_DEFER)

				dev_warn(&ofdev->dev,

					 "failed to get clock: %d\n", ret);

			ret = dev_err_probe(dev, PTR_ERR(info->clk), "failed to get clock\n");

			goto err_pmruntime;

		}
@@ -67,7 +65,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev, 


	ret = of_address_to_resource(np, 0, &resource);

	if (ret) {

		dev_warn(&ofdev->dev, "invalid address\n");

		dev_err_probe(dev, ret, "invalid address\n");

		goto err_unprepare;

	}
@@ -85,9 +83,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev, 
		/* Check for shifted address mapping */

		if (of_property_read_u32(np, "reg-offset", &prop) == 0) {

			if (prop >= port->mapsize) {

				dev_warn(&ofdev->dev, "reg-offset %u exceeds region size %pa\n",

				ret = dev_err_probe(dev, -EINVAL, "reg-offset %u exceeds region size %pa\n",

						    prop, &port->mapsize);

				ret = -EINVAL;

				goto err_unprepare;

			}
@@ -109,9 +106,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev, 
					       UPIO_MEM32BE : UPIO_MEM32;

				break;

			default:

				dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",

				ret = dev_err_probe(dev, -EINVAL, "unsupported reg-io-width (%u)\n",

						    prop);

				ret = -EINVAL;

				goto err_unprepare;

			}

		}