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

Groups > linux.kernel > #1569633

[PATCH 05/14] [media] rc: sunxi-cir: 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>
---
 drivers/media/rc/sunxi-cir.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c
index eaadc081760ae..b1e22bd47985e 100644
--- a/drivers/media/rc/sunxi-cir.c
+++ b/drivers/media/rc/sunxi-cir.c
@@ -174,16 +174,11 @@ static int sunxi_ir_probe(struct platform_device *pdev)
 
 	/* Reset (optional) */
 	ir->rst = devm_reset_control_get_optional(dev, NULL);
-	if (IS_ERR(ir->rst)) {
-		ret = PTR_ERR(ir->rst);
-		if (ret == -EPROBE_DEFER)
-			return ret;
-		ir->rst = NULL;
-	} else {
-		ret = reset_control_deassert(ir->rst);
-		if (ret)
-			return ret;
-	}
+	if (IS_ERR(ir->rst))
+		return PTR_ERR(ir->rst);
+	ret = reset_control_deassert(ir->rst);
+	if (ret)
+		return ret;
 
 	ret = clk_set_rate(ir->clk, SUNXI_IR_BASE_CLK);
 	if (ret) {
@@ -292,8 +287,7 @@ static int sunxi_ir_probe(struct platform_device *pdev)
 exit_clkdisable_apb_clk:
 	clk_disable_unprepare(ir->apb_clk);
 exit_reset_assert:
-	if (ir->rst)
-		reset_control_assert(ir->rst);
+	reset_control_assert(ir->rst);
 
 	return ret;
 }
@@ -305,8 +299,7 @@ static int sunxi_ir_remove(struct platform_device *pdev)
 
 	clk_disable_unprepare(ir->clk);
 	clk_disable_unprepare(ir->apb_clk);
-	if (ir->rst)
-		reset_control_assert(ir->rst);
+	reset_control_assert(ir->rst);
 
 	spin_lock_irqsave(&ir->ir_lock, flags);
 	/* disable IR IRQ */
-- 
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