Skip to content

Commit 16cd1c2

Browse files
torvaldstorvalds
committed
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]()
2 parents ff0c666 + 244132c commit 16cd1c2

File tree

796 files changed

+1650
-1718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

796 files changed

+1650
-1718
lines changed

‎Documentation/trace/ftrace.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3077,7 +3077,7 @@ Notice that we lost the sys_nanosleep.
30773077
# cat set_ftrace_filter
30783078
hrtimer_run_queues
30793079
hrtimer_run_pending
3080-
hrtimer_init
3080+
hrtimer_setup
30813081
hrtimer_cancel
30823082
hrtimer_try_to_cancel
30833083
hrtimer_forward
@@ -3115,7 +3115,7 @@ Again, now we want to append.
31153115
# cat set_ftrace_filter
31163116
hrtimer_run_queues
31173117
hrtimer_run_pending
3118-
hrtimer_init
3118+
hrtimer_setup
31193119
hrtimer_cancel
31203120
hrtimer_try_to_cancel
31213121
hrtimer_forward

‎arch/alpha/kernel/srmcons.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ srmcons_close(struct tty_struct *tty, struct file *filp)
177177

178178
if (tty->count == 1) {
179179
port->tty = NULL;
180-
del_timer(&srmconsp->timer);
180+
timer_delete(&srmconsp->timer);
181181
}
182182

183183
spin_unlock_irqrestore(&port->lock, flags);

‎arch/arm/mach-footbridge/dc21285.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static struct timer_list perr_timer;
135135

136136
static void dc21285_enable_error(struct timer_list *timer)
137137
{
138-
del_timer(timer);
138+
timer_delete(timer);
139139

140140
if (timer == &serr_timer)
141141
enable_irq(IRQ_PCI_SERR);

‎arch/arm/mach-pxa/sharpsl_pm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,8 @@ static void sharpsl_pm_remove(struct platform_device *pdev)
913913
if (sharpsl_pm.machinfo->exit)
914914
sharpsl_pm.machinfo->exit();
915915

916-
del_timer_sync(&sharpsl_pm.chrg_full_timer);
917-
del_timer_sync(&sharpsl_pm.ac_timer);
916+
timer_delete_sync(&sharpsl_pm.chrg_full_timer);
917+
timer_delete_sync(&sharpsl_pm.ac_timer);
918918
}
919919

920920
static struct platform_driver sharpsl_pm_driver = {

‎arch/m68k/amiga/amisound.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void amiga_mksound( unsigned int hz, unsigned int ticks )
7878
return;
7979

8080
local_irq_save(flags);
81-
del_timer( &sound_timer );
81+
timer_delete(&sound_timer);
8282

8383
if (hz > 20 && hz < 32767) {
8484
unsigned long period = (clock_constant / hz);

‎arch/m68k/mac/macboing.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void mac_mksound( unsigned int freq, unsigned int length )
183183

184184
local_irq_save(flags);
185185

186-
del_timer( &mac_sound_timer );
186+
timer_delete(&mac_sound_timer);
187187

188188
for ( i = 0; i < 0x800; i++ )
189189
mac_asc_regs[ i ] = 0;
@@ -277,7 +277,7 @@ static void mac_quadra_ring_bell(struct timer_list *unused)
277277

278278
local_irq_save(flags);
279279

280-
del_timer( &mac_sound_timer );
280+
timer_delete(&mac_sound_timer);
281281

282282
if ( mac_bell_duration-- > 0 )
283283
{

‎arch/mips/sgi-ip22/ip22-reset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void blink_timeout(struct timer_list *unused)
9898

9999
static void debounce(struct timer_list *unused)
100100
{
101-
del_timer(&debounce_timer);
101+
timer_delete(&debounce_timer);
102102
if (sgint->istat1 & SGINT_ISTAT1_PWR) {
103103
/* Interrupt still being sent. */
104104
debounce_timer.expires = jiffies + (HZ / 20); /* 0.05s */

‎arch/powerpc/kvm/booke.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu)
622622
if (nr_jiffies < NEXT_TIMER_MAX_DELTA)
623623
mod_timer(&vcpu->arch.wdt_timer, jiffies + nr_jiffies);
624624
else
625-
del_timer(&vcpu->arch.wdt_timer);
625+
timer_delete(&vcpu->arch.wdt_timer);
626626
spin_unlock_irqrestore(&vcpu->arch.wdt_lock, flags);
627627
}
628628

@@ -1441,7 +1441,7 @@ int kvmppc_subarch_vcpu_init(struct kvm_vcpu *vcpu)
14411441

14421442
void kvmppc_subarch_vcpu_uninit(struct kvm_vcpu *vcpu)
14431443
{
1444-
del_timer_sync(&vcpu->arch.wdt_timer);
1444+
timer_delete_sync(&vcpu->arch.wdt_timer);
14451445
}
14461446

14471447
int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

‎arch/powerpc/platforms/cell/spufs/sched.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ static void __spu_del_from_rq(struct spu_context *ctx)
508508

509509
if (!list_empty(&ctx->rq)) {
510510
if (!--spu_prio->nr_waiting)
511-
del_timer(&spusched_timer);
511+
timer_delete(&spusched_timer);
512512
list_del_init(&ctx->rq);
513513

514514
if (list_empty(&spu_prio->runq[prio]))
@@ -1126,8 +1126,8 @@ void spu_sched_exit(void)
11261126

11271127
remove_proc_entry("spu_loadavg", NULL);
11281128

1129-
del_timer_sync(&spusched_timer);
1130-
del_timer_sync(&spuloadavg_timer);
1129+
timer_delete_sync(&spusched_timer);
1130+
timer_delete_sync(&spuloadavg_timer);
11311131
kthread_stop(spusched_task);
11321132

11331133
for (node = 0; node < MAX_NUMNODES; node++) {

‎arch/powerpc/platforms/powermac/low_i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static irqreturn_t kw_i2c_irq(int irq, void *dev_id)
347347
unsigned long flags;
348348

349349
spin_lock_irqsave(&host->lock, flags);
350-
del_timer(&host->timeout_timer);
350+
timer_delete(&host->timeout_timer);
351351
kw_i2c_handle_interrupt(host, kw_read_reg(reg_isr));
352352
if (host->state != state_idle) {
353353
host->timeout_timer.expires = jiffies + KW_POLL_TIMEOUT;

‎arch/s390/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ static void stp_work_fn(struct work_struct *work)
680680

681681
if (!stp_online) {
682682
chsc_sstpc(stp_page, STP_OP_CTRL, 0x0000, NULL);
683-
del_timer_sync(&stp_timer);
683+
timer_delete_sync(&stp_timer);
684684
goto out_unlock;
685685
}
686686

‎arch/s390/mm/cmm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ static void cmm_set_timer(void)
201201
{
202202
if (cmm_timed_pages_target <= 0 || cmm_timeout_seconds <= 0) {
203203
if (timer_pending(&cmm_timer))
204-
del_timer(&cmm_timer);
204+
timer_delete(&cmm_timer);
205205
return;
206206
}
207207
mod_timer(&cmm_timer, jiffies + secs_to_jiffies(cmm_timeout_seconds));
@@ -424,7 +424,7 @@ static int __init cmm_init(void)
424424
#endif
425425
unregister_sysctl_table(cmm_sysctl_header);
426426
out_sysctl:
427-
del_timer_sync(&cmm_timer);
427+
timer_delete_sync(&cmm_timer);
428428
return rc;
429429
}
430430
module_init(cmm_init);
@@ -437,7 +437,7 @@ static void __exit cmm_exit(void)
437437
#endif
438438
unregister_oom_notifier(&cmm_oom_nb);
439439
kthread_stop(cmm_thread_ptr);
440-
del_timer_sync(&cmm_timer);
440+
timer_delete_sync(&cmm_timer);
441441
cmm_free_pages(cmm_pages, &cmm_pages, &cmm_page_list);
442442
cmm_free_pages(cmm_timed_pages, &cmm_timed_pages, &cmm_timed_page_list);
443443
}

‎arch/sh/drivers/pci/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static void pcibios_enable_err(struct timer_list *t)
9090
{
9191
struct pci_channel *hose = from_timer(hose, t, err_timer);
9292

93-
del_timer(&hose->err_timer);
93+
timer_delete(&hose->err_timer);
9494
printk(KERN_DEBUG "PCI: re-enabling error IRQ.\n");
9595
enable_irq(hose->err_irq);
9696
}
@@ -99,7 +99,7 @@ static void pcibios_enable_serr(struct timer_list *t)
9999
{
100100
struct pci_channel *hose = from_timer(hose, t, serr_timer);
101101

102-
del_timer(&hose->serr_timer);
102+
timer_delete(&hose->serr_timer);
103103
printk(KERN_DEBUG "PCI: re-enabling system error IRQ.\n");
104104
enable_irq(hose->serr_irq);
105105
}

‎arch/sparc/kernel/led.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static ssize_t led_proc_write(struct file *file, const char __user *buffer,
8484
/* before we change anything we want to stop any running timers,
8585
* otherwise calls such as on will have no persistent effect
8686
*/
87-
del_timer_sync(&led_blink_timer);
87+
timer_delete_sync(&led_blink_timer);
8888

8989
if (!strcmp(buf, "on")) {
9090
auxio_set_led(AUXIO_LED_ON);
@@ -134,7 +134,7 @@ static int __init led_init(void)
134134
static void __exit led_exit(void)
135135
{
136136
remove_proc_entry("led", NULL);
137-
del_timer_sync(&led_blink_timer);
137+
timer_delete_sync(&led_blink_timer);
138138
}
139139

140140
module_init(led_init);

‎arch/um/drivers/vector_kern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ static int vector_net_close(struct net_device *dev)
11121112
struct vector_private *vp = netdev_priv(dev);
11131113

11141114
netif_stop_queue(dev);
1115-
del_timer(&vp->tl);
1115+
timer_delete(&vp->tl);
11161116

11171117
vp->opened = false;
11181118

‎arch/x86/kernel/cpu/mce/core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,13 +1786,13 @@ void mce_timer_kick(bool storm)
17861786
__this_cpu_write(mce_next_interval, check_interval * HZ);
17871787
}
17881788

1789-
/* Must not be called in IRQ context where del_timer_sync() can deadlock */
1789+
/* Must not be called in IRQ context where timer_delete_sync() can deadlock */
17901790
static void mce_timer_delete_all(void)
17911791
{
17921792
int cpu;
17931793

17941794
for_each_online_cpu(cpu)
1795-
del_timer_sync(&per_cpu(mce_timer, cpu));
1795+
timer_delete_sync(&per_cpu(mce_timer, cpu));
17961796
}
17971797

17981798
static void __mcheck_cpu_mce_banks_init(void)
@@ -2820,7 +2820,7 @@ static int mce_cpu_pre_down(unsigned int cpu)
28202820
struct timer_list *t = this_cpu_ptr(&mce_timer);
28212821

28222822
mce_disable_cpu();
2823-
del_timer_sync(t);
2823+
timer_delete_sync(t);
28242824
mce_threshold_remove_device(cpu);
28252825
mce_device_remove(cpu);
28262826
return 0;

‎arch/x86/kvm/xen.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,7 +1553,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode,
15531553
kvm_vcpu_halt(vcpu);
15541554

15551555
if (sched_poll.timeout)
1556-
del_timer(&vcpu->arch.xen.poll_timer);
1556+
timer_delete(&vcpu->arch.xen.poll_timer);
15571557

15581558
kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE);
15591559
}
@@ -2308,7 +2308,7 @@ void kvm_xen_destroy_vcpu(struct kvm_vcpu *vcpu)
23082308
kvm_gpc_deactivate(&vcpu->arch.xen.vcpu_info_cache);
23092309
kvm_gpc_deactivate(&vcpu->arch.xen.vcpu_time_info_cache);
23102310

2311-
del_timer_sync(&vcpu->arch.xen.poll_timer);
2311+
timer_delete_sync(&vcpu->arch.xen.poll_timer);
23122312
}
23132313

23142314
void kvm_xen_init_vm(struct kvm *kvm)

‎arch/xtensa/platforms/iss/console.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
4848
static void rs_close(struct tty_struct *tty, struct file * filp)
4949
{
5050
if (tty->count == 1)
51-
del_timer_sync(&serial_timer);
51+
timer_delete_sync(&serial_timer);
5252
}
5353

5454

‎arch/xtensa/platforms/iss/network.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ static int iss_net_close(struct net_device *dev)
375375
struct iss_net_private *lp = netdev_priv(dev);
376376

377377
netif_stop_queue(dev);
378-
del_timer_sync(&lp->timer);
378+
timer_delete_sync(&lp->timer);
379379
lp->tp.net_ops->close(lp);
380380

381381
return 0;

‎block/blk-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ EXPORT_SYMBOL_GPL(blk_status_to_str);
219219
*/
220220
void blk_sync_queue(struct request_queue *q)
221221
{
222-
del_timer_sync(&q->timeout);
222+
timer_delete_sync(&q->timeout);
223223
cancel_work_sync(&q->timeout_work);
224224
}
225225
EXPORT_SYMBOL(blk_sync_queue);

‎block/blk-stat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void blk_stat_remove_callback(struct request_queue *q,
162162
blk_queue_flag_clear(QUEUE_FLAG_STATS, q);
163163
spin_unlock_irqrestore(&q->stats->lock, flags);
164164

165-
del_timer_sync(&cb->timer);
165+
timer_delete_sync(&cb->timer);
166166
}
167167

168168
static void blk_stat_free_callback_rcu(struct rcu_head *head)

‎block/blk-stat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static inline void blk_stat_activate_nsecs(struct blk_stat_callback *cb,
148148

149149
static inline void blk_stat_deactivate(struct blk_stat_callback *cb)
150150
{
151-
del_timer_sync(&cb->timer);
151+
timer_delete_sync(&cb->timer);
152152
}
153153

154154
/**

‎block/blk-throttle.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ static void throtl_pd_free(struct blkg_policy_data *pd)
333333
{
334334
struct throtl_grp *tg = pd_to_tg(pd);
335335

336-
del_timer_sync(&tg->service_queue.pending_timer);
336+
timer_delete_sync(&tg->service_queue.pending_timer);
337337
blkg_rwstat_exit(&tg->stat_bytes);
338338
blkg_rwstat_exit(&tg->stat_ios);
339339
kfree(tg);
@@ -1711,7 +1711,7 @@ void blk_throtl_exit(struct gendisk *disk)
17111711
if (!blk_throtl_activated(q))
17121712
return;
17131713

1714-
del_timer_sync(&q->td->service_queue.pending_timer);
1714+
timer_delete_sync(&q->td->service_queue.pending_timer);
17151715
throtl_shutdown_wq(q);
17161716
blkcg_deactivate_policy(disk, &blkcg_policy_throtl);
17171717
kfree(q->td);

‎drivers/accel/qaic/qaic_timesync.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static void qaic_timesync_remove(struct mhi_device *mhi_dev)
221221
{
222222
struct mqts_dev *mqtsdev = dev_get_drvdata(&mhi_dev->dev);
223223

224-
del_timer_sync(&mqtsdev->timer);
224+
timer_delete_sync(&mqtsdev->timer);
225225
mhi_unprepare_from_transfer(mqtsdev->mhi_dev);
226226
kfree(mqtsdev->sync_msg);
227227
kfree(mqtsdev);

0 commit comments

Comments
 (0)