[PATCH] kernel/watchdog: change prototype of watchdog_nmi_enable()

[PATCH] kernel/watchdog: change prototype of watchdog_nmi_enable()

[Pingfan Liu]

The only caller does not handle the return value of
watchdog_nmi_enable(). If there is an error, it seems to be reported by
arch specific code.

Hence changing watchdog_nmi_enable() return value from int to void.

Signed-off-by: Pingfan Liu <kernelfans@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Wang Qing <wangqing@vivo.com>
Cc: Santosh Sivaraj <santosh@fossix.org>
Cc: Tejun Heo <tj@kernel.org>
To: sparclinux@vger.kernel.org
To: linux-kernel@vger.kernel.org
---
 arch/sparc/kernel/nmi.c | 8 +++-----
 include/linux/nmi.h     | 2 +-
 kernel/watchdog.c       | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index 060fff95a305..5dcf31f7e81f 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -282,11 +282,11 @@ __setup("nmi_watchdog=", setup_nmi_watchdog);
  * sparc specific NMI watchdog enable function.
  * Enables watchdog if it is not enabled already.
  */
-int watchdog_nmi_enable(unsigned int cpu)
+void watchdog_nmi_enable(unsigned int cpu)
 {
 	if (atomic_read(&nmi_active) == -1) {
 		pr_warn("NMI watchdog cannot be enabled or disabled\n");
-		return -1;
+		return;
 	}
 
 	/*
@@ -295,11 +295,9 @@ int watchdog_nmi_enable(unsigned int cpu)
 	 * process first.
 	 */
 	if (!nmi_init_done)
-		return 0;
+		return;
 
 	smp_call_function_single(cpu, start_nmi_watchdog, NULL, 1);
-
-	return 0;
 }
 /*
  * sparc specific NMI watchdog disable function.
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 750c7f395ca9..b7bcd63c36b4 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -119,7 +119,7 @@ static inline int hardlockup_detector_perf_init(void) { return 0; }
 void watchdog_nmi_stop(void);
 void watchdog_nmi_start(void);
 int watchdog_nmi_probe(void);
-int watchdog_nmi_enable(unsigned int cpu);
+void watchdog_nmi_enable(unsigned int cpu);
 void watchdog_nmi_disable(unsigned int cpu);
 
 /**
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index ad912511a0c0..ea31fcf3b83b 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -95,10 +95,9 @@ __setup("nmi_watchdog=", hardlockup_panic_setup);
  * softlockup watchdog start and stop. The arch must select the
  * SOFTLOCKUP_DETECTOR Kconfig.
  */
-int __weak watchdog_nmi_enable(unsigned int cpu)
+void __weak watchdog_nmi_enable(unsigned int cpu)
 {
 	hardlockup_detector_perf_enable();
-	return 0;
 }
 
 void __weak watchdog_nmi_disable(unsigned int cpu)
-- 
2.29.2

Re: [PATCH] kernel/watchdog: change prototype of watchdog_nmi_enable()

[Petr Mladek]

On Tue 2021-08-24 11:14:35, Pingfan Liu wrote:
> The only caller does not handle the return value of
> watchdog_nmi_enable(). If there is an error, it seems to be reported by
> arch specific code.
> 
> Hence changing watchdog_nmi_enable() return value from int to void.
> 
> Signed-off-by: Pingfan Liu <kernelfans@gmail.com>

Looks good to me:

Reviewed-by: Petr Mladek <pmladek@suse.com>

Best Regards,
Petr

Re: [PATCH] kernel/watchdog: change prototype of watchdog_nmi_enable()

[Pingfan Liu]

Hi Petr,

Thank you for reviewing.

But I am composing a series, which may overstep this patch. So please
drop this patch, and sorry for inconvenience.

Regards,

Pingfan

On Thu, Aug 26, 2021 at 10:36 PM Petr Mladek <pmladek@suse.com> wrote:
>
> On Tue 2021-08-24 11:14:35, Pingfan Liu wrote:
> > The only caller does not handle the return value of
> > watchdog_nmi_enable(). If there is an error, it seems to be reported by
> > arch specific code.
> >
> > Hence changing watchdog_nmi_enable() return value from int to void.
> >
> > Signed-off-by: Pingfan Liu <kernelfans@gmail.com>
>
> Looks good to me:
>
> Reviewed-by: Petr Mladek <pmladek@suse.com>
>
> Best Regards,
> Petr