| Message ID | 1578921266-6025-3-git-send-email-fabrice.gasnier@st.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d344961f55fd6321937d3bc92ad3930dea31189f |
| Headers | show |
| Series | iio: dac: stm32-dac: improve reset controller use | expand |
On Mon, 13 Jan 2020 14:14:26 +0100 Fabrice Gasnier <fabrice.gasnier@st.com> wrote: > From: Etienne Carriere <etienne.carriere@st.com> > > Use devm_reset_control_get_optional_exclusive() instead of > devm_reset_control_get_exclusive() as reset controller is optional. > > Nevertheless if reset controller is expected but reports an > error, propagate the error code to the caller. In such case > a nice error trace is emitted unless we're deferring the probe > operation. > > Signed-off-by: Etienne Carriere <etienne.carriere@st.com> > Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com> Applied to the togreg branch of iio.git and pushed out as testing. Thanks, Jonathan > --- > drivers/iio/dac/stm32-dac-core.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/dac/stm32-dac-core.c b/drivers/iio/dac/stm32-dac-core.c > index 4d93446..7e5809b 100644 > --- a/drivers/iio/dac/stm32-dac-core.c > +++ b/drivers/iio/dac/stm32-dac-core.c > @@ -147,8 +147,16 @@ static int stm32_dac_probe(struct platform_device *pdev) > priv->common.vref_mv = ret / 1000; > dev_dbg(dev, "vref+=%dmV\n", priv->common.vref_mv); > > - rst = devm_reset_control_get_exclusive(dev, NULL); > - if (!IS_ERR(rst)) { > + rst = devm_reset_control_get_optional_exclusive(dev, NULL); > + if (rst) { > + if (IS_ERR(rst)) { > + ret = PTR_ERR(rst); > + if (ret != -EPROBE_DEFER) > + dev_err(dev, "reset get failed, %d\n", ret); > + > + goto err_hw_stop; > + } > + > reset_control_assert(rst); > udelay(2); > reset_control_deassert(rst);
diff --git a/drivers/iio/dac/stm32-dac-core.c b/drivers/iio/dac/stm32-dac-core.c index 4d93446..7e5809b 100644 --- a/drivers/iio/dac/stm32-dac-core.c +++ b/drivers/iio/dac/stm32-dac-core.c @@ -147,8 +147,16 @@ static int stm32_dac_probe(struct platform_device *pdev) priv->common.vref_mv = ret / 1000; dev_dbg(dev, "vref+=%dmV\n", priv->common.vref_mv); - rst = devm_reset_control_get_exclusive(dev, NULL); - if (!IS_ERR(rst)) { + rst = devm_reset_control_get_optional_exclusive(dev, NULL); + if (rst) { + if (IS_ERR(rst)) { + ret = PTR_ERR(rst); + if (ret != -EPROBE_DEFER) + dev_err(dev, "reset get failed, %d\n", ret); + + goto err_hw_stop; + } + reset_control_assert(rst); udelay(2); reset_control_deassert(rst);