powerpc/time: Remove generic_suspend_{dis/en}able_irqs()

Commit d75d68cfef49 ("powerpc: Clean up obsolete code relating to
decrementer and timebase") made generic_suspend_enable_irqs() and
generic_suspend_disable_irqs() static.

Fold them into their only caller.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/c3f9ec9950394ef939014f7934268e6ee30ca04f.1630398566.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 934d8ae66cc63b12e599a49cb1c2d04920b7a4ad..cae8f03a44fe07ac569a20a8c1a8d45b5903fe17 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -631,8 +631,12 @@ void timer_broadcast_interrupt(void)
 #endif
 
 #ifdef CONFIG_SUSPEND
-static void generic_suspend_disable_irqs(void)
+/* Overrides the weak version in kernel/power/main.c */
+void arch_suspend_disable_irqs(void)
 {
+       if (ppc_md.suspend_disable_irqs)
+               ppc_md.suspend_disable_irqs();
+
        /* Disable the decrementer, so that it doesn't interfere
         * with suspending.
         */
@@ -642,23 +646,11 @@ static void generic_suspend_disable_irqs(void)
        set_dec(decrementer_max);
 }
 
-static void generic_suspend_enable_irqs(void)
-{
-       local_irq_enable();
-}
-
-/* Overrides the weak version in kernel/power/main.c */
-void arch_suspend_disable_irqs(void)
-{
-       if (ppc_md.suspend_disable_irqs)
-               ppc_md.suspend_disable_irqs();
-       generic_suspend_disable_irqs();
-}
-
 /* Overrides the weak version in kernel/power/main.c */
 void arch_suspend_enable_irqs(void)
 {
-       generic_suspend_enable_irqs();
+       local_irq_enable();
+
        if (ppc_md.suspend_enable_irqs)
                ppc_md.suspend_enable_irqs();
 }