From: Borislav Petkov <bp@xxxxxxx>
Avoid homegrown notifier registration checks.
No functional changes.
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxxx
---
arch/mips/kernel/relocate.c | 6 ++++--
arch/mips/sgi-ip22/ip22-reset.c | 4 +++-
arch/mips/sgi-ip32/ip32-reset.c | 4 +++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c
index 56b51de2dc51..d577654242da 100644
--- a/arch/mips/kernel/relocate.c
+++ b/arch/mips/kernel/relocate.c
@@ -459,8 +459,10 @@ static struct notifier_block kernel_location_notifier = {
static int __init register_kernel_offset_dumper(void)
{
- atomic_notifier_chain_register(&panic_notifier_list,
- &kernel_location_notifier);
+ if (atomic_notifier_chain_register(&panic_notifier_list,
+ &kernel_location_notifier))
+ pr_warn("Kernel location notifier already registered\n");
+
return 0;
}
__initcall(register_kernel_offset_dumper);
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index 9028dbbb45dd..841fd31cac03 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -196,7 +196,9 @@ static int __init reboot_setup(void)
}
timer_setup(&blink_timer, blink_timeout, 0);
- atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
+
+ if (atomic_notifier_chain_register(&panic_notifier_list, &panic_block))
+ pr_warn("Panic notifier already registered\n");
return 0;
}
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index 18d1c115cd53..bdad9213f81b 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -145,7 +145,9 @@ static __init int ip32_reboot_setup(void)
pm_power_off = ip32_machine_halt;
timer_setup(&blink_timer, blink_timeout, 0);
- atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
+
+ if (atomic_notifier_chain_register(&panic_notifier_list, &panic_block))
+ pr_warn("Panic notifier already registered\n");
return 0;
}
--
2.29.2
