| Message ID | 20171218161839.14821-1-alexander.sverdlin@nokia.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] i2c: mux: reg: don't log an error for probe deferral | expand |
On 2017-12-18 17:18, Alexander Sverdlin wrote: > From: Tomasz Bachorski <tomasz.bachorski@nokia.com> > > It's possible that i2c_mux_reg_probe_dt() could return -EPROBE_DEFER. > In that case, driver will request a probe deferral and an error > suggesting device tree parsing problem will be reported. This is > a pretty confusing information. Let's change the error handling, > so driver will be able to request probe deferral without logging > not related errors. > > Signed-off-by: Tomasz Bachorski <tomasz.bachorski@nokia.com> Patch applied to i2c-mux/for-next, thanks! Cheers, Peter > --- > drivers/i2c/muxes/i2c-mux-reg.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c > index f6c9c3dc6cad..c948e5a4cb04 100644 > --- a/drivers/i2c/muxes/i2c-mux-reg.c > +++ b/drivers/i2c/muxes/i2c-mux-reg.c > @@ -177,6 +177,9 @@ static int i2c_mux_reg_probe(struct platform_device *pdev) > sizeof(mux->data)); > } else { > ret = i2c_mux_reg_probe_dt(mux, pdev); > + if (ret == -EPROBE_DEFER) > + return ret; > + > if (ret < 0) { > dev_err(&pdev->dev, "Error parsing device tree"); > return ret; >
diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c index f6c9c3dc6cad..c948e5a4cb04 100644 --- a/drivers/i2c/muxes/i2c-mux-reg.c +++ b/drivers/i2c/muxes/i2c-mux-reg.c @@ -177,6 +177,9 @@ static int i2c_mux_reg_probe(struct platform_device *pdev) sizeof(mux->data)); } else { ret = i2c_mux_reg_probe_dt(mux, pdev); + if (ret == -EPROBE_DEFER) + return ret; + if (ret < 0) { dev_err(&pdev->dev, "Error parsing device tree"); return ret;