Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1569631

[PATCH 09/14] mtd: nand: sunxi: simplify optional reset handling

Show all headers | View raw

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: Icenowy Zheng <icenowy@aosc.xyz>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: 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 e40482a65de66..c6769b52c666a 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -2196,16 +2196,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)
@@ -2246,8 +2245,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:
@@ -2262,8 +2260,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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/14] crypto: sun4i-ss - simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 12:50 +0100
  [PATCH 09/14] mtd: nand: sunxi: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 12:50 +0100
    Re: [PATCH 09/14] mtd: nand: sunxi: simplify optional reset  handling Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-01-30 14:00 +0100
      Re: [PATCH 09/14] mtd: nand: sunxi: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-31 18:30 +0100
      Re: [PATCH 09/14] mtd: nand: sunxi: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-31 19:10 +0100
  [PATCH 03/14] [media] coda: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 12:50 +0100
  [PATCH 05/14] [media] rc: sunxi-cir: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 12:50 +0100
  [PATCH 04/14] [media] st_rc: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 13:10 +0100
    Re: [PATCH 04/14] [media] st_rc: simplify optional reset handling Patrice CHOTARD <patrice.chotard@st.com> - 2017-01-30 13:40 +0100
  [PATCH 13/14] usb: host: ehci-st: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 13:10 +0100
  [PATCH 14/14] ASoC: sunxi: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 13:10 +0100
    Re: [PATCH 14/14] ASoC: sunxi: simplify optional reset handling Mark Brown <broonie@kernel.org> - 2017-01-30 13:40 +0100
      Re: [PATCH 14/14] ASoC: sunxi: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 15:10 +0100
    Re: [PATCH 14/14] ASoC: sunxi: simplify optional reset handling Chen-Yu Tsai <wens@csie.org> - 2017-01-31 05:00 +0100
    Re: [PATCH 14/14] ASoC: sunxi: simplify optional reset handling Mark Brown <broonie@kernel.org> - 2017-01-31 22:30 +0100
  [PATCH 12/14] usb: dwc2: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 13:10 +0100
    Re: [PATCH 12/14] usb: dwc2: simplify optional reset handling John Youn <John.Youn@synopsys.com> - 2017-01-31 01:30 +0100
      Re: [PATCH 12/14] usb: dwc2: simplify optional reset handling John Youn <John.Youn@synopsys.com> - 2017-01-31 01:50 +0100
  [PATCH 08/14] mmc: sunxi: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 13:10 +0100
    Re: [PATCH 08/14] mmc: sunxi: simplify optional reset handling Chen-Yu Tsai <wens@csie.org> - 2017-01-31 05:00 +0100
  [PATCH 06/14] mmc: dw_mmc: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 13:10 +0100
    Re: [PATCH 06/14] mmc: dw_mmc: simplify optional reset handling Ulf Hansson <ulf.hansson@linaro.org> - 2017-01-31 13:00 +0100
      Re: [PATCH 06/14] mmc: dw_mmc: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-31 18:50 +0100
  [PATCH 10/14] phy: meson8b-usb2: simplify optional reset handling Philipp Zabel <p.zabel@pengutronix.de> - 2017-01-30 13:10 +0100

csiph-web