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
This commit is contained in:
Ingo Molnar 2025-05-07 19:53:37 +02:00 committed by Thomas Gleixner
parent 367ed4e357
commit aad823aa3a
22 changed files with 25 additions and 25 deletions

View File

@ -560,7 +560,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd)
struct timer_list *timer = &wd->timer; struct timer_list *timer = &wd->timer;
timer_delete_sync(timer); timer_delete_sync(timer);
destroy_timer_on_stack(timer); timer_destroy_on_stack(timer);
} }
#else #else
#define DECLARE_DPM_WATCHDOG_ON_STACK(wd) #define DECLARE_DPM_WATCHDOG_ON_STACK(wd)

View File

@ -1353,7 +1353,7 @@ static void __cold try_to_generate_entropy(void)
mix_pool_bytes(&stack->entropy, sizeof(stack->entropy)); mix_pool_bytes(&stack->entropy, sizeof(stack->entropy));
timer_delete_sync(&stack->timer); timer_delete_sync(&stack->timer);
destroy_timer_on_stack(&stack->timer); timer_destroy_on_stack(&stack->timer);
} }

View File

@ -413,7 +413,7 @@ static int test_wait_timeout(void *arg)
err = 0; err = 0;
err_free: err_free:
timer_delete_sync(&wt.timer); timer_delete_sync(&wt.timer);
destroy_timer_on_stack(&wt.timer); timer_destroy_on_stack(&wt.timer);
dma_fence_signal(wt.f); dma_fence_signal(wt.f);
dma_fence_put(wt.f); dma_fence_put(wt.f);
return err; return err;

View File

@ -431,7 +431,7 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
fw_send_request(card, &t, tcode, destination_id, generation, speed, fw_send_request(card, &t, tcode, destination_id, generation, speed,
offset, payload, length, transaction_callback, &d); offset, payload, length, transaction_callback, &d);
wait_for_completion(&d.done); wait_for_completion(&d.done);
destroy_timer_on_stack(&t.split_timeout_timer); timer_destroy_on_stack(&t.split_timeout_timer);
return d.rcode; return d.rcode;
} }

View File

@ -343,7 +343,7 @@ static int suspend_test_thread(void *arg)
* later. * later.
*/ */
timer_delete(&wakeup_timer); timer_delete(&wakeup_timer);
destroy_timer_on_stack(&wakeup_timer); timer_destroy_on_stack(&wakeup_timer);
if (atomic_dec_return_relaxed(&nb_active_threads) == 0) if (atomic_dec_return_relaxed(&nb_active_threads) == 0)
complete(&suspend_threads_done); complete(&suspend_threads_done);

View File

@ -261,7 +261,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)
else if (ctx.sgr.bytes != len) else if (ctx.sgr.bytes != len)
ret = -EIO; ret = -EIO;
destroy_timer_on_stack(&ctx.timer); timer_destroy_on_stack(&ctx.timer);
return ret; return ret;
} }

View File

@ -661,7 +661,7 @@ static int live_emit_pte_full_ring(void *arg)
out_rq: out_rq:
i915_request_add(rq); /* GEM_BUG_ON(rq->reserved_space > ring->space)? */ i915_request_add(rq); /* GEM_BUG_ON(rq->reserved_space > ring->space)? */
timer_delete_sync(&st.timer); timer_delete_sync(&st.timer);
destroy_timer_on_stack(&st.timer); timer_destroy_on_stack(&st.timer);
out_unpin: out_unpin:
intel_context_unpin(ce); intel_context_unpin(ce);
out_put: out_put:

View File

@ -77,7 +77,7 @@ void timed_fence_fini(struct timed_fence *tf)
if (timer_delete_sync(&tf->timer)) if (timer_delete_sync(&tf->timer))
i915_sw_fence_commit(&tf->fence); i915_sw_fence_commit(&tf->fence);
destroy_timer_on_stack(&tf->timer); timer_destroy_on_stack(&tf->timer);
i915_sw_fence_fini(&tf->fence); i915_sw_fence_fini(&tf->fence);
} }

View File

@ -201,7 +201,7 @@ static int threaded_ttm_bo_reserve(void *arg)
err = ttm_bo_reserve(bo, interruptible, no_wait, &ctx); err = ttm_bo_reserve(bo, interruptible, no_wait, &ctx);
timer_delete_sync(&s_timer.timer); timer_delete_sync(&s_timer.timer);
destroy_timer_on_stack(&s_timer.timer); timer_destroy_on_stack(&s_timer.timer);
ww_acquire_fini(&ctx); ww_acquire_fini(&ctx);

View File

@ -3806,7 +3806,7 @@ status);
if ((status < 0) && (!probe_fl)) { if ((status < 0) && (!probe_fl)) {
pvr2_hdw_render_useless(hdw); pvr2_hdw_render_useless(hdw);
} }
destroy_timer_on_stack(&timer.timer); timer_destroy_on_stack(&timer.timer);
return status; return status;
} }

View File

@ -3952,7 +3952,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter)
timer_delete_sync(&timeout.timer); timer_delete_sync(&timeout.timer);
destroy_timer_on_stack(&timeout.timer); timer_destroy_on_stack(&timeout.timer);
mutex_unlock(&raid_dev->sysfs_mtx); mutex_unlock(&raid_dev->sysfs_mtx);

View File

@ -704,7 +704,7 @@ lld_ioctl(mraid_mmadp_t *adp, uioc_t *kioc)
wait_event(wait_q, (kioc->status != -ENODATA)); wait_event(wait_q, (kioc->status != -ENODATA));
if (timeout.timer.function) { if (timeout.timer.function) {
timer_delete_sync(&timeout.timer); timer_delete_sync(&timeout.timer);
destroy_timer_on_stack(&timeout.timer); timer_destroy_on_stack(&timeout.timer);
} }
/* /*

View File

@ -611,7 +611,7 @@ static void start_wait_timer(struct wait_info *winfo)
static void remove_wait_timer(struct wait_info *winfo) static void remove_wait_timer(struct wait_info *winfo)
{ {
timer_delete_sync(&winfo->timer); timer_delete_sync(&winfo->timer);
destroy_timer_on_stack(&winfo->timer); timer_destroy_on_stack(&winfo->timer);
} }
/* /*

View File

@ -598,7 +598,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
mod_timer(&timer.timer, jiffies + msecs_to_jiffies(CMD_TIMEOUT)); mod_timer(&timer.timer, jiffies + msecs_to_jiffies(CMD_TIMEOUT));
wait_for_completion(done); wait_for_completion(done);
timer_delete_sync(&timer.timer); timer_delete_sync(&timer.timer);
destroy_timer_on_stack(&timer.timer); timer_destroy_on_stack(&timer.timer);
if (actual_length) if (actual_length)
*actual_length = urb->actual_length; *actual_length = urb->actual_length;

View File

@ -630,7 +630,7 @@ static int perform_sglist(
retval = -ETIMEDOUT; retval = -ETIMEDOUT;
else else
retval = req->status; retval = req->status;
destroy_timer_on_stack(&timeout.timer); timer_destroy_on_stack(&timeout.timer);
/* FIXME check resulting data pattern */ /* FIXME check resulting data pattern */

View File

@ -122,7 +122,7 @@ void bch2_kthread_io_clock_wait(struct io_clock *clock,
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
timer_delete_sync(&wait.cpu_timer); timer_delete_sync(&wait.cpu_timer);
destroy_timer_on_stack(&wait.cpu_timer); timer_destroy_on_stack(&wait.cpu_timer);
bch2_io_timer_del(clock, &wait.io_timer); bch2_io_timer_del(clock, &wait.io_timer);
} }

View File

@ -115,7 +115,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
* *
* Regular timer initialization should use either DEFINE_TIMER() above, * Regular timer initialization should use either DEFINE_TIMER() above,
* or timer_setup(). For timers on the stack, timer_setup_on_stack() must * or timer_setup(). For timers on the stack, timer_setup_on_stack() must
* be used and must be balanced with a call to destroy_timer_on_stack(). * be used and must be balanced with a call to timer_destroy_on_stack().
*/ */
#define timer_setup(timer, callback, flags) \ #define timer_setup(timer, callback, flags) \
__timer_init((timer), (callback), (flags)) __timer_init((timer), (callback), (flags))
@ -124,9 +124,9 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
__timer_init_on_stack((timer), (callback), (flags)) __timer_init_on_stack((timer), (callback), (flags))
#ifdef CONFIG_DEBUG_OBJECTS_TIMERS #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
extern void destroy_timer_on_stack(struct timer_list *timer); extern void timer_destroy_on_stack(struct timer_list *timer);
#else #else
static inline void destroy_timer_on_stack(struct timer_list *timer) { } static inline void timer_destroy_on_stack(struct timer_list *timer) { }
#endif #endif
#define from_timer(var, callback_timer, timer_fieldname) \ #define from_timer(var, callback_timer, timer_fieldname) \

View File

@ -1501,7 +1501,7 @@ static int access_thread(void *arg)
} }
} while (!torture_must_stop()); } while (!torture_must_stop());
timer_delete_sync(&timer); timer_delete_sync(&timer);
destroy_timer_on_stack(&timer); timer_destroy_on_stack(&timer);
torture_kthread_stopping("access_thread"); torture_kthread_stopping("access_thread");
return 0; return 0;

View File

@ -2325,7 +2325,7 @@ rcu_torture_reader(void *arg)
} while (!torture_must_stop()); } while (!torture_must_stop());
if (irqreader && cur_ops->irq_capable) { if (irqreader && cur_ops->irq_capable) {
timer_delete_sync(&t); timer_delete_sync(&t);
destroy_timer_on_stack(&t); timer_destroy_on_stack(&t);
} }
tick_dep_clear_task(current, TICK_DEP_BIT_RCU); tick_dep_clear_task(current, TICK_DEP_BIT_RCU);
torture_kthread_stopping("rcu_torture_reader"); torture_kthread_stopping("rcu_torture_reader");

View File

@ -100,7 +100,7 @@ signed long __sched schedule_timeout(signed long timeout)
timer_delete_sync(&timer.timer); timer_delete_sync(&timer.timer);
/* Remove the timer from the object tracker */ /* Remove the timer from the object tracker */
destroy_timer_on_stack(&timer.timer); timer_destroy_on_stack(&timer.timer);
timeout = expire - jiffies; timeout = expire - jiffies;

View File

@ -860,11 +860,11 @@ void timer_init_key_on_stack(struct timer_list *timer,
} }
EXPORT_SYMBOL_GPL(timer_init_key_on_stack); EXPORT_SYMBOL_GPL(timer_init_key_on_stack);
void destroy_timer_on_stack(struct timer_list *timer) void timer_destroy_on_stack(struct timer_list *timer)
{ {
debug_object_free(timer, &timer_debug_descr); debug_object_free(timer, &timer_debug_descr);
} }
EXPORT_SYMBOL_GPL(destroy_timer_on_stack); EXPORT_SYMBOL_GPL(timer_destroy_on_stack);
#else #else
static inline void debug_timer_init(struct timer_list *timer) { } static inline void debug_timer_init(struct timer_list *timer) { }

View File

@ -686,7 +686,7 @@ EXPORT_SYMBOL_GPL(destroy_work_on_stack);
void destroy_delayed_work_on_stack(struct delayed_work *work) void destroy_delayed_work_on_stack(struct delayed_work *work)
{ {
destroy_timer_on_stack(&work->timer); timer_destroy_on_stack(&work->timer);
debug_object_free(&work->work, &work_debug_descr); debug_object_free(&work->work, &work_debug_descr);
} }
EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack); EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack);