| Message ID | 20201106142327.3129-2-christophe.roullier@st.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: stm32_iwdg: don't print an error on probe deferral | expand |
On Fri, Nov 06, 2020 at 03:23:27PM +0100, Christophe Roullier wrote: > From: Etienne Carriere <etienne.carriere@st.com> > > Do not print an error trace when deferring probe for clock resources. > > Signed-off-by: Etienne Carriere <etienne.carriere@st.com> > Signed-off-by: Christophe Roullier <christophe.roullier@st.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/stm32_iwdg.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c > index 25188d6bbe15..a3436c296c97 100644 > --- a/drivers/watchdog/stm32_iwdg.c > +++ b/drivers/watchdog/stm32_iwdg.c > @@ -162,18 +162,15 @@ static int stm32_iwdg_clk_init(struct platform_device *pdev, > u32 ret; > > wdt->clk_lsi = devm_clk_get(dev, "lsi"); > - if (IS_ERR(wdt->clk_lsi)) { > - dev_err(dev, "Unable to get lsi clock\n"); > - return PTR_ERR(wdt->clk_lsi); > - } > + if (IS_ERR(wdt->clk_lsi)) > + return dev_err_probe(dev, PTR_ERR(wdt->clk_lsi), "Unable to get lsi clock\n"); > > /* optional peripheral clock */ > if (wdt->data->has_pclk) { > wdt->clk_pclk = devm_clk_get(dev, "pclk"); > - if (IS_ERR(wdt->clk_pclk)) { > - dev_err(dev, "Unable to get pclk clock\n"); > - return PTR_ERR(wdt->clk_pclk); > - } > + if (IS_ERR(wdt->clk_pclk)) > + return dev_err_probe(dev, PTR_ERR(wdt->clk_pclk), > + "Unable to get pclk clock\n"); > > ret = clk_prepare_enable(wdt->clk_pclk); > if (ret) { > -- > 2.17.1 >
diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c index 25188d6bbe15..a3436c296c97 100644 --- a/drivers/watchdog/stm32_iwdg.c +++ b/drivers/watchdog/stm32_iwdg.c @@ -162,18 +162,15 @@ static int stm32_iwdg_clk_init(struct platform_device *pdev, u32 ret; wdt->clk_lsi = devm_clk_get(dev, "lsi"); - if (IS_ERR(wdt->clk_lsi)) { - dev_err(dev, "Unable to get lsi clock\n"); - return PTR_ERR(wdt->clk_lsi); - } + if (IS_ERR(wdt->clk_lsi)) + return dev_err_probe(dev, PTR_ERR(wdt->clk_lsi), "Unable to get lsi clock\n"); /* optional peripheral clock */ if (wdt->data->has_pclk) { wdt->clk_pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(wdt->clk_pclk)) { - dev_err(dev, "Unable to get pclk clock\n"); - return PTR_ERR(wdt->clk_pclk); - } + if (IS_ERR(wdt->clk_pclk)) + return dev_err_probe(dev, PTR_ERR(wdt->clk_pclk), + "Unable to get pclk clock\n"); ret = clk_prepare_enable(wdt->clk_pclk); if (ret) {