Commit 16cd1c26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-cleanups-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer cleanups from Thomas Gleixner:
 "A set of final cleanups for the timer subsystem:

   - Convert all del_timer[_sync]() instances over to the new
     timer_delete[_sync]() API and remove the legacy wrappers.

     Conversion was done with coccinelle plus some manual fixups as
     coccinelle chokes on scoped_guard().

   - The final cleanup of the hrtimer_init() to hrtimer_setup()
     conversion.

     This has been delayed to the end of the merge window, so that all
     patches which have been merged through other trees are in mainline
     and all new users are catched.

  Doing this right before rc1 ensures that new code which is merged post
  rc1 is not introducing new instances of the original functionality"

* tag 'timers-cleanups-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tracing/timers: Rename the hrtimer_init event to hrtimer_setup
  hrtimers: Rename debug_init_on_stack() to debug_setup_on_stack()
  hrtimers: Rename debug_init() to debug_setup()
  hrtimers: Rename __hrtimer_init_sleeper() to __hrtimer_setup_sleeper()
  hrtimers: Remove unnecessary NULL check in hrtimer_start_range_ns()
  hrtimers: Make callback function pointer private
  hrtimers: Merge __hrtimer_init() into __hrtimer_setup()
  hrtimers: Switch to use __htimer_setup()
  hrtimers: Delete hrtimer_init()
  treewide: Convert new and leftover hrtimer_init() users
  treewide: Switch/rename to timer_delete[_sync]()
parents ff0c6668 244132c4

Documentation/trace/ftrace.rst

+2 −2
Original line number Diff line number Diff line
@@ -3077,7 +3077,7 @@ Notice that we lost the sys_nanosleep. 
  # cat set_ftrace_filter

  hrtimer_run_queues

  hrtimer_run_pending

  hrtimer_init

  hrtimer_setup

  hrtimer_cancel

  hrtimer_try_to_cancel

  hrtimer_forward
@@ -3115,7 +3115,7 @@ Again, now we want to append. 
  # cat set_ftrace_filter

  hrtimer_run_queues

  hrtimer_run_pending

  hrtimer_init

  hrtimer_setup

  hrtimer_cancel

  hrtimer_try_to_cancel

  hrtimer_forward

arch/alpha/kernel/srmcons.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ srmcons_close(struct tty_struct *tty, struct file *filp) 


	if (tty->count == 1) {

		port->tty = NULL;

		del_timer(&srmconsp->timer);

		timer_delete(&srmconsp->timer);

	}



	spin_unlock_irqrestore(&port->lock, flags);

arch/arm/mach-footbridge/dc21285.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static struct timer_list perr_timer; 


static void dc21285_enable_error(struct timer_list *timer)

{

	del_timer(timer);

	timer_delete(timer);



	if (timer == &serr_timer)

		enable_irq(IRQ_PCI_SERR);

arch/arm/mach-pxa/sharpsl_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -913,8 +913,8 @@ static void sharpsl_pm_remove(struct platform_device *pdev) 
	if (sharpsl_pm.machinfo->exit)

		sharpsl_pm.machinfo->exit();



	del_timer_sync(&sharpsl_pm.chrg_full_timer);

	del_timer_sync(&sharpsl_pm.ac_timer);

	timer_delete_sync(&sharpsl_pm.chrg_full_timer);

	timer_delete_sync(&sharpsl_pm.ac_timer);

}



static struct platform_driver sharpsl_pm_driver = {

arch/m68k/amiga/amisound.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ void amiga_mksound( unsigned int hz, unsigned int ticks ) 
		return;



	local_irq_save(flags);

	del_timer( &sound_timer );

	timer_delete(&sound_timer);



	if (hz > 20 && hz < 32767) {

		unsigned long period = (clock_constant / hz);