mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-27 11:58:32 -04:00
Merge tag 'timers-cleanups-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer cleanups from Thomas Gleixner:
"Another set of timer API cleanups:
- Convert init_timer*(), try_to_del_timer_sync() and
destroy_timer_on_stack() over to the canonical timer_*()
namespace convention.
There is another large conversion pending, which has not been included
because it would have caused a gazillion of merge conflicts in next.
The conversion scripts will be run towards the end of the merge window
and a pull request sent once all conflict dependencies have been
merged"
* tag 'timers-cleanups-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
treewide, timers: Rename destroy_timer_on_stack() as timer_destroy_on_stack()
treewide, timers: Rename try_to_del_timer_sync() as timer_delete_sync_try()
timers: Rename init_timers() as timers_init()
timers: Rename NEXT_TIMER_MAX_DELTA as TIMER_NEXT_MAX_DELTA
timers: Rename __init_timer_on_stack() as __timer_init_on_stack()
timers: Rename __init_timer() as __timer_init()
timers: Rename init_timer_on_stack_key() as timer_init_key_on_stack()
timers: Rename init_timer_key() as timer_init_key()
This commit is contained in:
@@ -661,7 +661,7 @@ static int live_emit_pte_full_ring(void *arg)
|
||||
out_rq:
|
||||
i915_request_add(rq); /* GEM_BUG_ON(rq->reserved_space > ring->space)? */
|
||||
timer_delete_sync(&st.timer);
|
||||
destroy_timer_on_stack(&st.timer);
|
||||
timer_destroy_on_stack(&st.timer);
|
||||
out_unpin:
|
||||
intel_context_unpin(ce);
|
||||
out_put:
|
||||
|
||||
@@ -77,7 +77,7 @@ void timed_fence_fini(struct timed_fence *tf)
|
||||
if (timer_delete_sync(&tf->timer))
|
||||
i915_sw_fence_commit(&tf->fence);
|
||||
|
||||
destroy_timer_on_stack(&tf->timer);
|
||||
timer_destroy_on_stack(&tf->timer);
|
||||
i915_sw_fence_fini(&tf->fence);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user