Nobody cares about the return value of watchdog_nmi_enable(),
changing its prototype to void.
This commit reworks from [1].
[1] https://lore.kernel.org/lkml/20211014024155.15253-2-kernelfans@gmail.com/
Signed-off-by: Pingfan Liu <kernelfans@gmail.com>
Signed-off-by: Lecopzer Chen <lecopzer.chen@mediatek.com>
---
arch/sparc/kernel/nmi.c | 8 ++++----
include/linux/nmi.h | 2 +-
kernel/watchdog.c | 3 +--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index 060fff95a305..8dc0f4e820b0 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,11 @@ 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;
+ return;
}
/*
* 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 db451e943a04..b71d434cf648 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -93,10 +93,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.25.1
On Sat 2022-02-12 18:43:46, Lecopzer Chen wrote: > > Nobody cares about the return value of watchdog_nmi_enable(), > changing its prototype to void. > > --- 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,11 @@ 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; > + return; Return at the end of the function is superfluous. > } > /* > * sparc specific NMI watchdog disable function. Otherwise, it looks good. Reviewed-by: Petr Mladek <pmladek@suse.com> Best Regards, Petr
> On Sat 2022-02-12 18:43:46, Lecopzer Chen wrote: > > > > Nobody cares about the return value of watchdog_nmi_enable(), > > changing its prototype to void. > > > > --- 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,11 @@ 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; > > + return; > > Return at the end of the function is superfluous. Thanks, I'll fix in the next patch. > > > } > > /* > > * sparc specific NMI watchdog disable function. > > Otherwise, it looks good. > > Reviewed-by: Petr Mladek <pmladek@suse.com> >
© 2016 - 2024 Red Hat, Inc.