|
@@ -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);
|