imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-03 16:13:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

serial: 8250_dw: simplify optional reset handling

Browse Source 
As of commit bb475230b8 ("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: Philipp Zabel <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Philipp Zabel authored and Greg Kroah-Hartman committed 2017-03-17 14:17:12 +09:00
1 parent 22077b091a
commit acbdad8dd1
1 file changed
+5 -8
Download Patch File Download Diff File Expand all files Collapse all files
drivers/tty/serial/8250/8250_dw.c
+5 -8
View File
@@ -525,12 +525,11 @@ 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);
reset_control_deassert(data->rst);
dw8250_quirks(p, data);
@@ -562,8 +561,7 @@ static int dw8250_probe(struct platform_device *pdev)
return 0;
err_reset:
if (!IS_ERR(data->rst))
reset_control_assert(data->rst);
reset_control_assert(data->rst);
err_pclk:
if (!IS_ERR(data->pclk))
@@ -584,8 +582,7 @@ static int dw8250_remove(struct platform_device *pdev)
serial8250_unregister_port(data->line);
if (!IS_ERR(data->rst))
reset_control_assert(data->rst);
reset_control_assert(data->rst);
if (!IS_ERR(data->pclk))
clk_disable_unprepare(data->pclk);