| Message ID | 20190527102939.7616-1-thierry.reding@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: tegra: Avoid error message on deferred probe | expand |
On 27/05/2019 11:29, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > If the driver defers probe because of a missing clock, avoid outputting > an error message. The clock will show up eventually. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/i2c/busses/i2c-tegra.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c > index ebaa78d17d6e..6bfd5297f425 100644 > --- a/drivers/i2c/busses/i2c-tegra.c > +++ b/drivers/i2c/busses/i2c-tegra.c > @@ -1517,7 +1517,9 @@ static int tegra_i2c_probe(struct platform_device *pdev) > > div_clk = devm_clk_get(&pdev->dev, "div-clk"); > if (IS_ERR(div_clk)) { > - dev_err(&pdev->dev, "missing controller clock\n"); > + if (PTR_ERR(div_clk) != -EPROBE_DEFER) > + dev_err(&pdev->dev, "missing controller clock\n"); > + > return PTR_ERR(div_clk); > } Acked-by: Jon Hunter <jonathanh@nvidia.com> Cheers Jon
On Mon, May 27, 2019 at 12:29:39PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > If the driver defers probe because of a missing clock, avoid outputting > an error message. The clock will show up eventually. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/i2c/busses/i2c-tegra.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Hi Wolfram, any comments on this patch or is it good to go? Thanks, Thierry > diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c > index ebaa78d17d6e..6bfd5297f425 100644 > --- a/drivers/i2c/busses/i2c-tegra.c > +++ b/drivers/i2c/busses/i2c-tegra.c > @@ -1517,7 +1517,9 @@ static int tegra_i2c_probe(struct platform_device *pdev) > > div_clk = devm_clk_get(&pdev->dev, "div-clk"); > if (IS_ERR(div_clk)) { > - dev_err(&pdev->dev, "missing controller clock\n"); > + if (PTR_ERR(div_clk) != -EPROBE_DEFER) > + dev_err(&pdev->dev, "missing controller clock\n"); > + > return PTR_ERR(div_clk); > } > > -- > 2.21.0 >
On Mon, May 27, 2019 at 12:29:39PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > If the driver defers probe because of a missing clock, avoid outputting > an error message. The clock will show up eventually. > > Signed-off-by: Thierry Reding <treding@nvidia.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index ebaa78d17d6e..6bfd5297f425 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1517,7 +1517,9 @@ static int tegra_i2c_probe(struct platform_device *pdev) div_clk = devm_clk_get(&pdev->dev, "div-clk"); if (IS_ERR(div_clk)) { - dev_err(&pdev->dev, "missing controller clock\n"); + if (PTR_ERR(div_clk) != -EPROBE_DEFER) + dev_err(&pdev->dev, "missing controller clock\n"); + return PTR_ERR(div_clk); }