Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acbdad8d authored by Philipp Zabel's avatar Philipp Zabel Committed by Greg Kroah-Hartman
Browse files

serial: 8250_dw: simplify optional reset handling 



As of commit bb475230 ("reset: make optional functions really
optional"), the reset framework API calls use NULL pointers to describe
optional, non-present reset controls.

This allows to return errors from devm_reset_control_get_optional and to
call reset_control_(de)assert unconditionally.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22077b09

drivers/tty/serial/8250/8250_dw.c

+5 −8
Original line number Diff line number Diff line
@@ -525,11 +525,10 @@ static int dw8250_probe(struct platform_device *pdev) 
	}



	data->rst = devm_reset_control_get_optional(dev, NULL);

	if (IS_ERR(data->rst) && PTR_ERR(data->rst) == -EPROBE_DEFER) {

		err = -EPROBE_DEFER;

	if (IS_ERR(data->rst)) {

		err = PTR_ERR(data->rst);

		goto err_pclk;

	}

	if (!IS_ERR(data->rst))

	reset_control_deassert(data->rst);



	dw8250_quirks(p, data);
@@ -562,7 +561,6 @@ static int dw8250_probe(struct platform_device *pdev) 
	return 0;



err_reset:

	if (!IS_ERR(data->rst))

	reset_control_assert(data->rst);



err_pclk:
@@ -584,7 +582,6 @@ static int dw8250_remove(struct platform_device *pdev) 


	serial8250_unregister_port(data->line);



	if (!IS_ERR(data->rst))

	reset_control_assert(data->rst);



	if (!IS_ERR(data->pclk))