Skip to content

Commit aad823a

Browse files
Ingo MolnarKAGA-KOKO
authored andcommitted
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
1 parent 367ed4e commit aad823a

File tree

22 files changed

+25
-25
lines changed

22 files changed

+25
-25
lines changed

drivers/base/power/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd)
560560
struct timer_list *timer = &wd->timer;
561561

562562
timer_delete_sync(timer);
563-
destroy_timer_on_stack(timer);
563+
timer_destroy_on_stack(timer);
564564
}
565565
#else
566566
#define DECLARE_DPM_WATCHDOG_ON_STACK(wd)

drivers/char/random.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,7 @@ static void __cold try_to_generate_entropy(void)
13531353
mix_pool_bytes(&stack->entropy, sizeof(stack->entropy));
13541354

13551355
timer_delete_sync(&stack->timer);
1356-
destroy_timer_on_stack(&stack->timer);
1356+
timer_destroy_on_stack(&stack->timer);
13571357
}
13581358

13591359

drivers/dma-buf/st-dma-fence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ static int test_wait_timeout(void *arg)
413413
err = 0;
414414
err_free:
415415
timer_delete_sync(&wt.timer);
416-
destroy_timer_on_stack(&wt.timer);
416+
timer_destroy_on_stack(&wt.timer);
417417
dma_fence_signal(wt.f);
418418
dma_fence_put(wt.f);
419419
return err;

drivers/firewire/core-transaction.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
431431
fw_send_request(card, &t, tcode, destination_id, generation, speed,
432432
offset, payload, length, transaction_callback, &d);
433433
wait_for_completion(&d.done);
434-
destroy_timer_on_stack(&t.split_timeout_timer);
434+
timer_destroy_on_stack(&t.split_timeout_timer);
435435

436436
return d.rcode;
437437
}

drivers/firmware/psci/psci_checker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static int suspend_test_thread(void *arg)
343343
* later.
344344
*/
345345
timer_delete(&wakeup_timer);
346-
destroy_timer_on_stack(&wakeup_timer);
346+
timer_destroy_on_stack(&wakeup_timer);
347347

348348
if (atomic_dec_return_relaxed(&nb_active_threads) == 0)
349349
complete(&suspend_threads_done);

drivers/gpu/drm/gud/gud_pipe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)
261261
else if (ctx.sgr.bytes != len)
262262
ret = -EIO;
263263

264-
destroy_timer_on_stack(&ctx.timer);
264+
timer_destroy_on_stack(&ctx.timer);
265265

266266
return ret;
267267
}

drivers/gpu/drm/i915/gt/selftest_migrate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ static int live_emit_pte_full_ring(void *arg)
661661
out_rq:
662662
i915_request_add(rq); /* GEM_BUG_ON(rq->reserved_space > ring->space)? */
663663
timer_delete_sync(&st.timer);
664-
destroy_timer_on_stack(&st.timer);
664+
timer_destroy_on_stack(&st.timer);
665665
out_unpin:
666666
intel_context_unpin(ce);
667667
out_put:

drivers/gpu/drm/i915/selftests/lib_sw_fence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void timed_fence_fini(struct timed_fence *tf)
7777
if (timer_delete_sync(&tf->timer))
7878
i915_sw_fence_commit(&tf->fence);
7979

80-
destroy_timer_on_stack(&tf->timer);
80+
timer_destroy_on_stack(&tf->timer);
8181
i915_sw_fence_fini(&tf->fence);
8282
}
8383

drivers/gpu/drm/ttm/tests/ttm_bo_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ static int threaded_ttm_bo_reserve(void *arg)
201201
err = ttm_bo_reserve(bo, interruptible, no_wait, &ctx);
202202

203203
timer_delete_sync(&s_timer.timer);
204-
destroy_timer_on_stack(&s_timer.timer);
204+
timer_destroy_on_stack(&s_timer.timer);
205205

206206
ww_acquire_fini(&ctx);
207207

drivers/media/usb/pvrusb2/pvrusb2-hdw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3806,7 +3806,7 @@ status);
38063806
if ((status < 0) && (!probe_fl)) {
38073807
pvr2_hdw_render_useless(hdw);
38083808
}
3809-
destroy_timer_on_stack(&timer.timer);
3809+
timer_destroy_on_stack(&timer.timer);
38103810

38113811
return status;
38123812
}

0 commit comments

Comments
 (0)