| Message ID | 20190905073730.22258-1-oliver.graute@kococonnector.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1] watchdog: imx_sc: this patch just fixes whitespaces | expand |
On 9/5/19 12:44 AM, Oliver Graute wrote: > Fix only whitespace errors in imx_sc_wdt_probe() > > Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com> This patch no longer applies due to commit "watchdog: imx_sc: Remove unnecessary error log". Guenter > --- > drivers/watchdog/imx_sc_wdt.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c > index 78eaaf75a263..94db949042c9 100644 > --- a/drivers/watchdog/imx_sc_wdt.c > +++ b/drivers/watchdog/imx_sc_wdt.c > @@ -175,12 +175,12 @@ 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"); > - return ret; > - } > - > + > + if (ret) { > + dev_err(dev, "Failed to register watchdog device\n"); > + return ret; > + } > + > ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, > SC_IRQ_WDOG, > true); >
On 05/09/19, Guenter Roeck wrote: > On 9/5/19 12:44 AM, Oliver Graute wrote: > > Fix only whitespace errors in imx_sc_wdt_probe() > > > > Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com> > > This patch no longer applies due to commit "watchdog: imx_sc: Remove > unnecessary error log". > ok I'll rebase patch against linux-staging/watchdog-next Best regards, Oliver
On Thu, Sep 05, 2019 at 02:35:37PM +0000, Oliver Graute wrote: > On 05/09/19, Guenter Roeck wrote: > > On 9/5/19 12:44 AM, Oliver Graute wrote: > > > Fix only whitespace errors in imx_sc_wdt_probe() > > > > > > Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com> > > > > This patch no longer applies due to commit "watchdog: imx_sc: Remove > > unnecessary error log". > > > > ok I'll rebase patch against linux-staging/watchdog-next > I should have said "no longer necessary". The mentioned patch makes the same change (and drops the error message). Guenter
diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c index 78eaaf75a263..94db949042c9 100644 --- a/drivers/watchdog/imx_sc_wdt.c +++ b/drivers/watchdog/imx_sc_wdt.c @@ -175,12 +175,12 @@ 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"); - return ret; - } - + + if (ret) { + dev_err(dev, "Failed to register watchdog device\n"); + return ret; + } + ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG, SC_IRQ_WDOG, true);
Fix only whitespace errors in imx_sc_wdt_probe() Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com> --- drivers/watchdog/imx_sc_wdt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)