| Message ID | 20190812084434.13316-1-Anson.Huang@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 30520ee8e3bac25dbb1bb43da0e49177be3e19c0 |
| Headers | show |
| Series | watchdog: imx_sc: Remove unnecessary error log | expand |
On 8/12/19 1:44 AM, Anson.Huang@nxp.com wrote: > From: Anson Huang <Anson.Huang@nxp.com> > > An error message is already displayed by watchdog_register_device() > when failed, so no need to have error log again for failure of > calling devm_watchdog_register_device(). > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/imx_sc_wdt.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c > index 78eaaf7..9260475 100644 > --- a/drivers/watchdog/imx_sc_wdt.c > +++ b/drivers/watchdog/imx_sc_wdt.c > @@ -175,11 +175,8 @@ static int imx_sc_wdt_probe(struct platform_device *pdev) > watchdog_stop_on_unregister(wdog); > > ret = devm_watchdog_register_device(dev, wdog); > - > - if (ret) { > - dev_err(dev, "Failed to register watchdog device\n"); > + if (ret) > return ret; > - } > > ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, > SC_IRQ_WDOG, >
diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c index 78eaaf7..9260475 100644 --- a/drivers/watchdog/imx_sc_wdt.c +++ b/drivers/watchdog/imx_sc_wdt.c @@ -175,11 +175,8 @@ static int imx_sc_wdt_probe(struct platform_device *pdev) watchdog_stop_on_unregister(wdog); ret = devm_watchdog_register_device(dev, wdog); - - if (ret) { - dev_err(dev, "Failed to register watchdog device\n"); + if (ret) return ret; - } ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, SC_IRQ_WDOG,