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

treewide, timers: Rename destroy_timer_on_stack() as timer_destroy_on_stack()

Move this API to the canonical timer_*() namespace.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250507175338.672442-10-mingo@kernel.org

authored by

Ingo Molnar and committed by
Thomas Gleixner
aad823aa 367ed4e3

+25 -25
+1 -1
drivers/base/power/main.c
··· 560 560 struct timer_list *timer = &wd->timer; 561 561 562 562 timer_delete_sync(timer); 563 - destroy_timer_on_stack(timer); 563 + timer_destroy_on_stack(timer); 564 564 } 565 565 #else 566 566 #define DECLARE_DPM_WATCHDOG_ON_STACK(wd)
+1 -1
drivers/char/random.c
··· 1353 1353 mix_pool_bytes(&stack->entropy, sizeof(stack->entropy)); 1354 1354 1355 1355 timer_delete_sync(&stack->timer); 1356 - destroy_timer_on_stack(&stack->timer); 1356 + timer_destroy_on_stack(&stack->timer); 1357 1357 } 1358 1358 1359 1359
+1 -1
drivers/dma-buf/st-dma-fence.c
··· 413 413 err = 0; 414 414 err_free: 415 415 timer_delete_sync(&wt.timer); 416 - destroy_timer_on_stack(&wt.timer); 416 + timer_destroy_on_stack(&wt.timer); 417 417 dma_fence_signal(wt.f); 418 418 dma_fence_put(wt.f); 419 419 return err;
+1 -1
drivers/firewire/core-transaction.c
··· 431 431 fw_send_request(card, &t, tcode, destination_id, generation, speed, 432 432 offset, payload, length, transaction_callback, &d); 433 433 wait_for_completion(&d.done); 434 - destroy_timer_on_stack(&t.split_timeout_timer); 434 + timer_destroy_on_stack(&t.split_timeout_timer); 435 435 436 436 return d.rcode; 437 437 }
+1 -1
drivers/firmware/psci/psci_checker.c
··· 343 343 * later. 344 344 */ 345 345 timer_delete(&wakeup_timer); 346 - destroy_timer_on_stack(&wakeup_timer); 346 + timer_destroy_on_stack(&wakeup_timer); 347 347 348 348 if (atomic_dec_return_relaxed(&nb_active_threads) == 0) 349 349 complete(&suspend_threads_done);
+1 -1
drivers/gpu/drm/gud/gud_pipe.c
··· 261 261 else if (ctx.sgr.bytes != len) 262 262 ret = -EIO; 263 263 264 - destroy_timer_on_stack(&ctx.timer); 264 + timer_destroy_on_stack(&ctx.timer); 265 265 266 266 return ret; 267 267 }
+1 -1
drivers/gpu/drm/i915/gt/selftest_migrate.c
··· 661 661 out_rq: 662 662 i915_request_add(rq); /* GEM_BUG_ON(rq->reserved_space > ring->space)? */ 663 663 timer_delete_sync(&st.timer); 664 - destroy_timer_on_stack(&st.timer); 664 + timer_destroy_on_stack(&st.timer); 665 665 out_unpin: 666 666 intel_context_unpin(ce); 667 667 out_put:
+1 -1
drivers/gpu/drm/i915/selftests/lib_sw_fence.c
··· 77 77 if (timer_delete_sync(&tf->timer)) 78 78 i915_sw_fence_commit(&tf->fence); 79 79 80 - destroy_timer_on_stack(&tf->timer); 80 + timer_destroy_on_stack(&tf->timer); 81 81 i915_sw_fence_fini(&tf->fence); 82 82 } 83 83
+1 -1
drivers/gpu/drm/ttm/tests/ttm_bo_test.c
··· 201 201 err = ttm_bo_reserve(bo, interruptible, no_wait, &ctx); 202 202 203 203 timer_delete_sync(&s_timer.timer); 204 - destroy_timer_on_stack(&s_timer.timer); 204 + timer_destroy_on_stack(&s_timer.timer); 205 205 206 206 ww_acquire_fini(&ctx); 207 207
+1 -1
drivers/media/usb/pvrusb2/pvrusb2-hdw.c
··· 3806 3806 if ((status < 0) && (!probe_fl)) { 3807 3807 pvr2_hdw_render_useless(hdw); 3808 3808 } 3809 - destroy_timer_on_stack(&timer.timer); 3809 + timer_destroy_on_stack(&timer.timer); 3810 3810 3811 3811 return status; 3812 3812 }
+1 -1
drivers/scsi/megaraid/megaraid_mbox.c
··· 3952 3952 3953 3953 3954 3954 timer_delete_sync(&timeout.timer); 3955 - destroy_timer_on_stack(&timeout.timer); 3955 + timer_destroy_on_stack(&timeout.timer); 3956 3956 3957 3957 mutex_unlock(&raid_dev->sysfs_mtx); 3958 3958
+1 -1
drivers/scsi/megaraid/megaraid_mm.c
··· 704 704 wait_event(wait_q, (kioc->status != -ENODATA)); 705 705 if (timeout.timer.function) { 706 706 timer_delete_sync(&timeout.timer); 707 - destroy_timer_on_stack(&timeout.timer); 707 + timer_destroy_on_stack(&timeout.timer); 708 708 } 709 709 710 710 /*
+1 -1
drivers/staging/gpib/common/iblib.c
··· 611 611 static void remove_wait_timer(struct wait_info *winfo) 612 612 { 613 613 timer_delete_sync(&winfo->timer); 614 - destroy_timer_on_stack(&winfo->timer); 614 + timer_destroy_on_stack(&winfo->timer); 615 615 } 616 616 617 617 /*
+1 -1
drivers/usb/atm/cxacru.c
··· 598 598 mod_timer(&timer.timer, jiffies + msecs_to_jiffies(CMD_TIMEOUT)); 599 599 wait_for_completion(done); 600 600 timer_delete_sync(&timer.timer); 601 - destroy_timer_on_stack(&timer.timer); 601 + timer_destroy_on_stack(&timer.timer); 602 602 603 603 if (actual_length) 604 604 *actual_length = urb->actual_length;
+1 -1
drivers/usb/misc/usbtest.c
··· 630 630 retval = -ETIMEDOUT; 631 631 else 632 632 retval = req->status; 633 - destroy_timer_on_stack(&timeout.timer); 633 + timer_destroy_on_stack(&timeout.timer); 634 634 635 635 /* FIXME check resulting data pattern */ 636 636
+1 -1
fs/bcachefs/clock.c
··· 122 122 123 123 __set_current_state(TASK_RUNNING); 124 124 timer_delete_sync(&wait.cpu_timer); 125 - destroy_timer_on_stack(&wait.cpu_timer); 125 + timer_destroy_on_stack(&wait.cpu_timer); 126 126 bch2_io_timer_del(clock, &wait.io_timer); 127 127 } 128 128
+3 -3
include/linux/timer.h
··· 115 115 * 116 116 * Regular timer initialization should use either DEFINE_TIMER() above, 117 117 * or timer_setup(). For timers on the stack, timer_setup_on_stack() must 118 - * be used and must be balanced with a call to destroy_timer_on_stack(). 118 + * be used and must be balanced with a call to timer_destroy_on_stack(). 119 119 */ 120 120 #define timer_setup(timer, callback, flags) \ 121 121 __timer_init((timer), (callback), (flags)) ··· 124 124 __timer_init_on_stack((timer), (callback), (flags)) 125 125 126 126 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS 127 - extern void destroy_timer_on_stack(struct timer_list *timer); 127 + extern void timer_destroy_on_stack(struct timer_list *timer); 128 128 #else 129 - static inline void destroy_timer_on_stack(struct timer_list *timer) { } 129 + static inline void timer_destroy_on_stack(struct timer_list *timer) { } 130 130 #endif 131 131 132 132 #define from_timer(var, callback_timer, timer_fieldname) \
+1 -1
kernel/kcsan/kcsan_test.c
··· 1501 1501 } 1502 1502 } while (!torture_must_stop()); 1503 1503 timer_delete_sync(&timer); 1504 - destroy_timer_on_stack(&timer); 1504 + timer_destroy_on_stack(&timer); 1505 1505 1506 1506 torture_kthread_stopping("access_thread"); 1507 1507 return 0;
+1 -1
kernel/rcu/rcutorture.c
··· 2325 2325 } while (!torture_must_stop()); 2326 2326 if (irqreader && cur_ops->irq_capable) { 2327 2327 timer_delete_sync(&t); 2328 - destroy_timer_on_stack(&t); 2328 + timer_destroy_on_stack(&t); 2329 2329 } 2330 2330 tick_dep_clear_task(current, TICK_DEP_BIT_RCU); 2331 2331 torture_kthread_stopping("rcu_torture_reader");
+1 -1
kernel/time/sleep_timeout.c
··· 100 100 timer_delete_sync(&timer.timer); 101 101 102 102 /* Remove the timer from the object tracker */ 103 - destroy_timer_on_stack(&timer.timer); 103 + timer_destroy_on_stack(&timer.timer); 104 104 105 105 timeout = expire - jiffies; 106 106
+2 -2
kernel/time/timer.c
··· 860 860 } 861 861 EXPORT_SYMBOL_GPL(timer_init_key_on_stack); 862 862 863 - void destroy_timer_on_stack(struct timer_list *timer) 863 + void timer_destroy_on_stack(struct timer_list *timer) 864 864 { 865 865 debug_object_free(timer, &timer_debug_descr); 866 866 } 867 - EXPORT_SYMBOL_GPL(destroy_timer_on_stack); 867 + EXPORT_SYMBOL_GPL(timer_destroy_on_stack); 868 868 869 869 #else 870 870 static inline void debug_timer_init(struct timer_list *timer) { }
+1 -1
kernel/workqueue.c
··· 686 686 687 687 void destroy_delayed_work_on_stack(struct delayed_work *work) 688 688 { 689 - destroy_timer_on_stack(&work->timer); 689 + timer_destroy_on_stack(&work->timer); 690 690 debug_object_free(&work->work, &work_debug_descr); 691 691 } 692 692 EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack);