Commit ea43a60b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

serial: 8250: Simplify with dev_err_probe() 



Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarLukas Wunner <lukas@wunner.de>
Link: https://lore.kernel.org/r/20200901153100.18827-1-krzk@kernel.org


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

drivers/tty/serial/8250/8250_bcm2835aux.c

+3 −9
Original line number Diff line number Diff line
@@ -110,12 +110,8 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev) 


	/* get the clock - this also enables the HW */

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

	ret = PTR_ERR_OR_ZERO(data->clk);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev, "could not get clk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(data->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(data->clk), "could not get clk\n");



	/* get the interrupt */

	ret = platform_get_irq(pdev, 0);
@@ -155,9 +151,7 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev) 
	/* register the port */

	ret = serial8250_register_8250_port(&up);

	if (ret < 0) {

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev,

				"unable to register 8250 port - %d\n", ret);

		dev_err_probe(&pdev->dev, ret, "unable to register 8250 port\n");

		goto dis_clk;

	}

	data->line = ret;

drivers/tty/serial/8250/8250_ingenic.c

+6 −14
Original line number Diff line number Diff line
@@ -259,22 +259,14 @@ static int ingenic_uart_probe(struct platform_device *pdev) 
		return -ENOMEM;



	data->clk_module = devm_clk_get(&pdev->dev, "module");

	if (IS_ERR(data->clk_module)) {

		err = PTR_ERR(data->clk_module);

		if (err != -EPROBE_DEFER)

			dev_err(&pdev->dev,

				"unable to get module clock: %d\n", err);

		return err;

	}

	if (IS_ERR(data->clk_module))

		return dev_err_probe(&pdev->dev, PTR_ERR(data->clk_module),

				     "unable to get module clock\n");



	data->clk_baud = devm_clk_get(&pdev->dev, "baud");

	if (IS_ERR(data->clk_baud)) {

		err = PTR_ERR(data->clk_baud);

		if (err != -EPROBE_DEFER)

			dev_err(&pdev->dev,

				"unable to get baud clock: %d\n", err);

		return err;

	}

	if (IS_ERR(data->clk_baud))

		return dev_err_probe(&pdev->dev, PTR_ERR(data->clk_baud),

				     "unable to get baud clock\n");



	err = clk_prepare_enable(data->clk_module);

	if (err) {