Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1569627 > unrolled thread
| Started by | Philipp Zabel <p.zabel@pengutronix.de> |
|---|---|
| First post | 2017-01-30 12:50 +0100 |
| Last post | 2017-02-07 17:50 +0100 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 11/14] serial: 8250_dw: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 12:50 +0100
Re: [PATCH 11/14] serial: 8250_dw: simplify optional reset handling Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-02-02 23:30 +0100
Re: [PATCH 11/14] serial: 8250_dw: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-02-07 17:50 +0100
Re: [PATCH 11/14] serial: 8250_dw: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-02-07 17:50 +0100
| From | Philipp Zabel <p.zabel@pengutronix.de> |
|---|---|
| Date | 2017-01-30 12:50 +0100 |
| Subject | [PATCH 11/14] serial: 8250_dw: simplify optional reset handling |
| Message-ID | <t5iD7-3th-7@gated-at.bofh.it> |
As of commit bb475230b8e5 ("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 <p.zabel@pengutronix.de>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/tty/serial/8250/8250_dw.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index c89fafc972b69..b8b911adff471 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -503,12 +503,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);
@@ -540,8 +539,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))
@@ -562,8 +560,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);
--
2.11.0
[toc] | [next] | [standalone]
| From | Andy Shevchenko <andy.shevchenko@gmail.com> |
|---|---|
| Date | 2017-02-02 23:30 +0100 |
| Message-ID | <t6y37-1w5-5@gated-at.bofh.it> |
| In reply to | #1569627 |
On Mon, Jan 30, 2017 at 1:41 PM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> As of commit bb475230b8e5 ("reset: make optional functions really
> optional"), the reset framework API calls use NULL pointers to describe
> optional, non-present reset controls.
Eventually!
FWIW:
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
>
> This allows to return errors from devm_reset_control_get_optional and to
> call reset_control_(de)assert unconditionally.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/tty/serial/8250/8250_dw.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
> index c89fafc972b69..b8b911adff471 100644
> --- a/drivers/tty/serial/8250/8250_dw.c
> +++ b/drivers/tty/serial/8250/8250_dw.c
> @@ -503,12 +503,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);
>
> @@ -540,8 +539,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))
> @@ -562,8 +560,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);
> --
> 2.11.0
>
--
With Best Regards,
Andy Shevchenko
[toc] | [prev] | [next] | [standalone]
| From | Philipp Zabel <p.zabel@pengutronix.de> |
|---|---|
| Date | 2017-02-07 17:50 +0100 |
| Message-ID | <t8h7Q-5ki-9@gated-at.bofh.it> |
| In reply to | #1572772 |
On Fri, 2017-02-03 at 00:21 +0200, Andy Shevchenko wrote:
> On Mon, Jan 30, 2017 at 1:41 PM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> > As of commit bb475230b8e5 ("reset: make optional functions really
> > optional"), the reset framework API calls use NULL pointers to describe
> > optional, non-present reset controls.
>
> Eventually!
That's fine, I'm going to wait for the above patch to hit mainline
before resending these patches anyway.
> FWIW:
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Thanks!
regards
Philipp
[toc] | [prev] | [next] | [standalone]
| From | Philipp Zabel <p.zabel@pengutronix.de> |
|---|---|
| Date | 2017-02-07 17:50 +0100 |
| Message-ID | <t8h7Q-5ki-25@gated-at.bofh.it> |
| In reply to | #1572772 |
On Fri, 2017-02-03 at 00:21 +0200, Andy Shevchenko wrote:
> On Mon, Jan 30, 2017 at 1:41 PM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> > As of commit bb475230b8e5 ("reset: make optional functions really
> > optional"), the reset framework API calls use NULL pointers to describe
> > optional, non-present reset controls.
>
> Eventually!
>
> FWIW:
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Thanks.
regards
Philipp
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web