* [PATCH v1] watchdog: imx_sc: this patch just fixes whitespaces
@ 2019-09-05 7:44 Oliver Graute
2019-09-05 13:24 ` Guenter Roeck
0 siblings, 1 reply; 4+ messages in thread
From: Oliver Graute @ 2019-09-05 7:44 UTC (permalink / raw)
To: oliver.graute@gmail.com
Cc: Oliver Graute, Rob Herring, Mark Rutland, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Wim Van Sebroeck, Guenter Roeck, Aisheng Dong, Daniel Baluta,
Ulf Hansson, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org
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(-)
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);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] watchdog: imx_sc: this patch just fixes whitespaces
2019-09-05 7:44 [PATCH v1] watchdog: imx_sc: this patch just fixes whitespaces Oliver Graute
@ 2019-09-05 13:24 ` Guenter Roeck
2019-09-05 14:35 ` Oliver Graute
0 siblings, 1 reply; 4+ messages in thread
From: Guenter Roeck @ 2019-09-05 13:24 UTC (permalink / raw)
To: Oliver Graute, oliver.graute@gmail.com
Cc: Rob Herring, Mark Rutland, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Wim Van Sebroeck, Aisheng Dong, Daniel Baluta, Ulf Hansson,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org
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);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] watchdog: imx_sc: this patch just fixes whitespaces
2019-09-05 13:24 ` Guenter Roeck
@ 2019-09-05 14:35 ` Oliver Graute
2019-09-05 15:06 ` Guenter Roeck
0 siblings, 1 reply; 4+ messages in thread
From: Oliver Graute @ 2019-09-05 14:35 UTC (permalink / raw)
To: Guenter Roeck
Cc: Mark Rutland, Aisheng Dong, Ulf Hansson,
linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org,
Shawn Guo, Sascha Hauer, linux-kernel@vger.kernel.org,
Daniel Baluta, Rob Herring, NXP Linux Team,
Pengutronix Kernel Team, Wim Van Sebroeck, Fabio Estevam,
linux-arm-kernel@lists.infradead.org
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] watchdog: imx_sc: this patch just fixes whitespaces
2019-09-05 14:35 ` Oliver Graute
@ 2019-09-05 15:06 ` Guenter Roeck
0 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2019-09-05 15:06 UTC (permalink / raw)
To: Oliver Graute
Cc: Rob Herring, Mark Rutland, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Wim Van Sebroeck, Aisheng Dong, Daniel Baluta, Ulf Hansson,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-05 15:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-05 7:44 [PATCH v1] watchdog: imx_sc: this patch just fixes whitespaces Oliver Graute
2019-09-05 13:24 ` Guenter Roeck
2019-09-05 14:35 ` Oliver Graute
2019-09-05 15:06 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).