Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Christophe Leroy and committed by
Michael Ellerman
e606a2f4 566af8cd

+7 -15
+7 -15
arch/powerpc/kernel/time.c
··· 631 631 #endif 632 632 633 633 #ifdef CONFIG_SUSPEND 634 - static void generic_suspend_disable_irqs(void) 634 + /* Overrides the weak version in kernel/power/main.c */ 635 + void arch_suspend_disable_irqs(void) 635 636 { 637 + if (ppc_md.suspend_disable_irqs) 638 + ppc_md.suspend_disable_irqs(); 639 + 636 640 /* Disable the decrementer, so that it doesn't interfere 637 641 * with suspending. 638 642 */ ··· 646 642 set_dec(decrementer_max); 647 643 } 648 644 649 - static void generic_suspend_enable_irqs(void) 650 - { 651 - local_irq_enable(); 652 - } 653 - 654 - /* Overrides the weak version in kernel/power/main.c */ 655 - void arch_suspend_disable_irqs(void) 656 - { 657 - if (ppc_md.suspend_disable_irqs) 658 - ppc_md.suspend_disable_irqs(); 659 - generic_suspend_disable_irqs(); 660 - } 661 - 662 645 /* Overrides the weak version in kernel/power/main.c */ 663 646 void arch_suspend_enable_irqs(void) 664 647 { 665 - generic_suspend_enable_irqs(); 648 + local_irq_enable(); 649 + 666 650 if (ppc_md.suspend_enable_irqs) 667 651 ppc_md.suspend_enable_irqs(); 668 652 }