* [PATCH v2 09/14] mtd: nand: sunxi: simplify optional reset handling
@ 2017-03-15 11:31 Philipp Zabel
2017-03-16 8:55 ` Boris Brezillon
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2017-03-15 11:31 UTC (permalink / raw)
To: linux-mtd
Cc: Boris Brezillon, David Woodhouse, Brian Norris, Marek Vasut,
Cyrille Pitchen, Maxime Ripard, Chen-Yu Tsai, linux-kernel,
Philipp Zabel
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>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/mtd/nand/sunxi_nand.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 0eeeb8b889ea8..9afc182cbd4e8 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -2212,16 +2212,15 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
goto out_ahb_clk_unprepare;
nfc->reset = devm_reset_control_get_optional(dev, "ahb");
- if (!IS_ERR(nfc->reset)) {
- ret = reset_control_deassert(nfc->reset);
- if (ret) {
- dev_err(dev, "reset err %d\n", ret);
- goto out_mod_clk_unprepare;
- }
- } else if (PTR_ERR(nfc->reset) != -ENOENT) {
+ if (IS_ERR(nfc->reset)) {
ret = PTR_ERR(nfc->reset);
goto out_mod_clk_unprepare;
}
+ ret = reset_control_deassert(nfc->reset);
+ if (ret) {
+ dev_err(dev, "reset err %d\n", ret);
+ goto out_mod_clk_unprepare;
+ }
ret = sunxi_nfc_rst(nfc);
if (ret)
@@ -2262,8 +2261,7 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
if (nfc->dmac)
dma_release_channel(nfc->dmac);
out_ahb_reset_reassert:
- if (!IS_ERR(nfc->reset))
- reset_control_assert(nfc->reset);
+ reset_control_assert(nfc->reset);
out_mod_clk_unprepare:
clk_disable_unprepare(nfc->mod_clk);
out_ahb_clk_unprepare:
@@ -2278,8 +2276,7 @@ static int sunxi_nfc_remove(struct platform_device *pdev)
sunxi_nand_chips_cleanup(nfc);
- if (!IS_ERR(nfc->reset))
- reset_control_assert(nfc->reset);
+ reset_control_assert(nfc->reset);
if (nfc->dmac)
dma_release_channel(nfc->dmac);
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2 09/14] mtd: nand: sunxi: simplify optional reset handling
2017-03-15 11:31 [PATCH v2 09/14] mtd: nand: sunxi: simplify optional reset handling Philipp Zabel
@ 2017-03-16 8:55 ` Boris Brezillon
0 siblings, 0 replies; 2+ messages in thread
From: Boris Brezillon @ 2017-03-16 8:55 UTC (permalink / raw)
To: Philipp Zabel
Cc: linux-mtd, David Woodhouse, Brian Norris, Marek Vasut,
Cyrille Pitchen, Maxime Ripard, Chen-Yu Tsai, linux-kernel
On Wed, 15 Mar 2017 12:31:47 +0100
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.
>
> 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>
> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Applied.
Thanks,
Boris
> ---
> drivers/mtd/nand/sunxi_nand.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
> index 0eeeb8b889ea8..9afc182cbd4e8 100644
> --- a/drivers/mtd/nand/sunxi_nand.c
> +++ b/drivers/mtd/nand/sunxi_nand.c
> @@ -2212,16 +2212,15 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
> goto out_ahb_clk_unprepare;
>
> nfc->reset = devm_reset_control_get_optional(dev, "ahb");
> - if (!IS_ERR(nfc->reset)) {
> - ret = reset_control_deassert(nfc->reset);
> - if (ret) {
> - dev_err(dev, "reset err %d\n", ret);
> - goto out_mod_clk_unprepare;
> - }
> - } else if (PTR_ERR(nfc->reset) != -ENOENT) {
> + if (IS_ERR(nfc->reset)) {
> ret = PTR_ERR(nfc->reset);
> goto out_mod_clk_unprepare;
> }
> + ret = reset_control_deassert(nfc->reset);
> + if (ret) {
> + dev_err(dev, "reset err %d\n", ret);
> + goto out_mod_clk_unprepare;
> + }
>
> ret = sunxi_nfc_rst(nfc);
> if (ret)
> @@ -2262,8 +2261,7 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
> if (nfc->dmac)
> dma_release_channel(nfc->dmac);
> out_ahb_reset_reassert:
> - if (!IS_ERR(nfc->reset))
> - reset_control_assert(nfc->reset);
> + reset_control_assert(nfc->reset);
> out_mod_clk_unprepare:
> clk_disable_unprepare(nfc->mod_clk);
> out_ahb_clk_unprepare:
> @@ -2278,8 +2276,7 @@ static int sunxi_nfc_remove(struct platform_device *pdev)
>
> sunxi_nand_chips_cleanup(nfc);
>
> - if (!IS_ERR(nfc->reset))
> - reset_control_assert(nfc->reset);
> + reset_control_assert(nfc->reset);
>
> if (nfc->dmac)
> dma_release_channel(nfc->dmac);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-16 8:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-15 11:31 [PATCH v2 09/14] mtd: nand: sunxi: simplify optional reset handling Philipp Zabel
2017-03-16 8:55 ` Boris Brezillon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox