Skip to content

Commit a50b4fe

Browse files
torvaldstorvalds
committed
Merge tag 'timers-cleanups-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer cleanups from Thomas Gleixner: "A treewide hrtimer timer cleanup hrtimers are initialized with hrtimer_init() and a subsequent store to the callback pointer. This turned out to be suboptimal for the upcoming Rust integration and is obviously a silly implementation to begin with. This cleanup replaces the hrtimer_init(T); T->function = cb; sequence with hrtimer_setup(T, cb); The conversion was done with Coccinelle and a few manual fixups. Once the conversion has completely landed in mainline, hrtimer_init() will be removed and the hrtimer::function becomes a private member" * tag 'timers-cleanups-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (100 commits) wifi: rt2x00: Switch to use hrtimer_update_function() io_uring: Use helper function hrtimer_update_function() serial: xilinx_uartps: Use helper function hrtimer_update_function() ASoC: fsl: imx-pcm-fiq: Switch to use hrtimer_setup() RDMA: Switch to use hrtimer_setup() virtio: mem: Switch to use hrtimer_setup() drm/vmwgfx: Switch to use hrtimer_setup() drm/xe/oa: Switch to use hrtimer_setup() drm/vkms: Switch to use hrtimer_setup() drm/msm: Switch to use hrtimer_setup() drm/i915/request: Switch to use hrtimer_setup() drm/i915/uncore: Switch to use hrtimer_setup() drm/i915/pmu: Switch to use hrtimer_setup() drm/i915/perf: Switch to use hrtimer_setup() drm/i915/gvt: Switch to use hrtimer_setup() drm/i915/huc: Switch to use hrtimer_setup() drm/amdgpu: Switch to use hrtimer_setup() stm class: heartbeat: Switch to use hrtimer_setup() i2c: Switch to use hrtimer_setup() iio: Switch to use hrtimer_setup() ...
2 parents d5048d1 + 86a578e commit a50b4fe

File tree

141 files changed

+281
-404
lines changed

Some content is hidden

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

141 files changed

+281
-404
lines changed

‎arch/arm/mach-imx/mmdc.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,8 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
509509
pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
510510
pmu_mmdc->devtype_data = device_get_match_data(&pdev->dev);
511511

512-
hrtimer_init(&pmu_mmdc->hrtimer, CLOCK_MONOTONIC,
513-
HRTIMER_MODE_REL);
514-
pmu_mmdc->hrtimer.function = mmdc_pmu_timer_handler;
512+
hrtimer_setup(&pmu_mmdc->hrtimer, mmdc_pmu_timer_handler, CLOCK_MONOTONIC,
513+
HRTIMER_MODE_REL);
515514

516515
cpumask_set_cpu(raw_smp_processor_id(), &pmu_mmdc->cpu);
517516

‎arch/arm/mm/cache-l2x0-pmu.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,7 @@ static __init int l2x0_pmu_init(void)
539539
* at higher frequencies.
540540
*/
541541
l2x0_pmu_poll_period = ms_to_ktime(1000);
542-
hrtimer_init(&l2x0_pmu_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
543-
l2x0_pmu_hrtimer.function = l2x0_pmu_poll;
542+
hrtimer_setup(&l2x0_pmu_hrtimer, l2x0_pmu_poll, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
544543

545544
cpumask_set_cpu(0, &pmu_cpu);
546545
ret = cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_L2X0_ONLINE,

‎arch/arm64/kvm/arch_timer.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -1070,8 +1070,7 @@ static void timer_context_init(struct kvm_vcpu *vcpu, int timerid)
10701070
else
10711071
ctxt->offset.vm_offset = &kvm->arch.timer_data.poffset;
10721072

1073-
hrtimer_init(&ctxt->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
1074-
ctxt->hrtimer.function = kvm_hrtimer_expire;
1073+
hrtimer_setup(&ctxt->hrtimer, kvm_hrtimer_expire, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
10751074

10761075
switch (timerid) {
10771076
case TIMER_PTIMER:
@@ -1098,8 +1097,8 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
10981097
timer_set_offset(vcpu_ptimer(vcpu), 0);
10991098
}
11001099

1101-
hrtimer_init(&timer->bg_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
1102-
timer->bg_timer.function = kvm_bg_timer_expire;
1100+
hrtimer_setup(&timer->bg_timer, kvm_bg_timer_expire, CLOCK_MONOTONIC,
1101+
HRTIMER_MODE_ABS_HARD);
11031102
}
11041103

11051104
void kvm_timer_init_vm(struct kvm *kvm)

‎arch/loongarch/kvm/vcpu.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1459,8 +1459,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
14591459
vcpu->arch.vpid = 0;
14601460
vcpu->arch.flush_gpa = INVALID_GPA;
14611461

1462-
hrtimer_init(&vcpu->arch.swtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED_HARD);
1463-
vcpu->arch.swtimer.function = kvm_swtimer_wakeup;
1462+
hrtimer_setup(&vcpu->arch.swtimer, kvm_swtimer_wakeup, CLOCK_MONOTONIC,
1463+
HRTIMER_MODE_ABS_PINNED_HARD);
14641464

14651465
vcpu->arch.handle_exit = kvm_handle_exit;
14661466
vcpu->arch.guest_eentry = (unsigned long)kvm_loongarch_ops->exc_entry;

‎arch/mips/kvm/mips.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
288288
if (err)
289289
return err;
290290

291-
hrtimer_init(&vcpu->arch.comparecount_timer, CLOCK_MONOTONIC,
292-
HRTIMER_MODE_REL);
293-
vcpu->arch.comparecount_timer.function = kvm_mips_comparecount_wakeup;
291+
hrtimer_setup(&vcpu->arch.comparecount_timer, kvm_mips_comparecount_wakeup, CLOCK_MONOTONIC,
292+
HRTIMER_MODE_REL);
294293

295294
/*
296295
* Allocate space for host mode exception handlers that handle

‎arch/powerpc/kernel/watchdog.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,7 @@ static void start_watchdog(void *arg)
495495

496496
*this_cpu_ptr(&wd_timer_tb) = get_tb();
497497

498-
hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
499-
hrtimer->function = watchdog_timer_fn;
498+
hrtimer_setup(hrtimer, watchdog_timer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
500499
hrtimer_start(hrtimer, ms_to_ktime(wd_timer_period_ms),
501500
HRTIMER_MODE_REL_PINNED);
502501
}

‎arch/powerpc/kvm/powerpc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
766766
{
767767
int err;
768768

769-
hrtimer_init(&vcpu->arch.dec_timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);
770-
vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup;
769+
hrtimer_setup(&vcpu->arch.dec_timer, kvmppc_decrementer_wakeup, CLOCK_REALTIME,
770+
HRTIMER_MODE_ABS);
771771

772772
#ifdef CONFIG_KVM_EXIT_TIMING
773773
mutex_init(&vcpu->arch.exit_timing_lock);

‎arch/riscv/kvm/vcpu_timer.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -248,18 +248,19 @@ int kvm_riscv_vcpu_timer_init(struct kvm_vcpu *vcpu)
248248
if (t->init_done)
249249
return -EINVAL;
250250

251-
hrtimer_init(&t->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
252251
t->init_done = true;
253252
t->next_set = false;
254253

255254
/* Enable sstc for every vcpu if available in hardware */
256255
if (riscv_isa_extension_available(NULL, SSTC)) {
257256
t->sstc_enabled = true;
258-
t->hrt.function = kvm_riscv_vcpu_vstimer_expired;
257+
hrtimer_setup(&t->hrt, kvm_riscv_vcpu_vstimer_expired, CLOCK_MONOTONIC,
258+
HRTIMER_MODE_REL);
259259
t->timer_next_event = kvm_riscv_vcpu_update_vstimecmp;
260260
} else {
261261
t->sstc_enabled = false;
262-
t->hrt.function = kvm_riscv_vcpu_hrtimer_expired;
262+
hrtimer_setup(&t->hrt, kvm_riscv_vcpu_hrtimer_expired, CLOCK_MONOTONIC,
263+
HRTIMER_MODE_REL);
263264
t->timer_next_event = kvm_riscv_vcpu_update_hrtimer;
264265
}
265266

‎arch/s390/kvm/interrupt.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -3174,8 +3174,7 @@ void kvm_s390_gisa_init(struct kvm *kvm)
31743174
gi->alert.mask = 0;
31753175
spin_lock_init(&gi->alert.ref_lock);
31763176
gi->expires = 50 * 1000; /* 50 usec */
3177-
hrtimer_init(&gi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
3178-
gi->timer.function = gisa_vcpu_kicker;
3177+
hrtimer_setup(&gi->timer, gisa_vcpu_kicker, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
31793178
memset(gi->origin, 0, sizeof(struct kvm_s390_gisa));
31803179
gi->origin->next_alert = (u32)virt_to_phys(gi->origin);
31813180
VM_EVENT(kvm, 3, "gisa 0x%pK initialized", gi->origin);

‎arch/s390/kvm/kvm-s390.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3943,8 +3943,8 @@ static int kvm_s390_vcpu_setup(struct kvm_vcpu *vcpu)
39433943
if (rc)
39443944
return rc;
39453945
}
3946-
hrtimer_init(&vcpu->arch.ckc_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
3947-
vcpu->arch.ckc_timer.function = kvm_s390_idle_wakeup;
3946+
hrtimer_setup(&vcpu->arch.ckc_timer, kvm_s390_idle_wakeup, CLOCK_MONOTONIC,
3947+
HRTIMER_MODE_REL);
39483948

39493949
vcpu->arch.sie_block->hpid = HPID_KVM;
39503950

‎arch/x86/events/intel/uncore.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,7 @@ void uncore_pmu_cancel_hrtimer(struct intel_uncore_box *box)
347347

348348
static void uncore_pmu_init_hrtimer(struct intel_uncore_box *box)
349349
{
350-
hrtimer_init(&box->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
351-
box->hrtimer.function = uncore_pmu_hrtimer;
350+
hrtimer_setup(&box->hrtimer, uncore_pmu_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
352351
}
353352

354353
static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type,

‎arch/x86/events/rapl.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,7 @@ static void rapl_hrtimer_init(struct rapl_pmu *rapl_pmu)
274274
{
275275
struct hrtimer *hr = &rapl_pmu->hrtimer;
276276

277-
hrtimer_init(hr, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
278-
hr->function = rapl_hrtimer_handle;
277+
hrtimer_setup(hr, rapl_hrtimer_handle, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
279278
}
280279

281280
static void __rapl_pmu_event_start(struct rapl_pmu *rapl_pmu,

‎arch/x86/kvm/hyperv.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,7 @@ static void stimer_init(struct kvm_vcpu_hv_stimer *stimer, int timer_index)
952952
{
953953
memset(stimer, 0, sizeof(*stimer));
954954
stimer->index = timer_index;
955-
hrtimer_init(&stimer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
956-
stimer->timer.function = stimer_timer_callback;
955+
hrtimer_setup(&stimer->timer, stimer_timer_callback, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
957956
stimer_prepare_msg(stimer);
958957
}
959958

‎arch/x86/kvm/i8254.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags)
690690
pit->kvm = kvm;
691691

692692
pit_state = &pit->pit_state;
693-
hrtimer_init(&pit_state->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
694-
pit_state->timer.function = pit_timer_fn;
693+
hrtimer_setup(&pit_state->timer, pit_timer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
695694

696695
pit_state->irq_ack_notifier.gsi = 0;
697696
pit_state->irq_ack_notifier.irq_acked = kvm_pit_ack_irq;

‎arch/x86/kvm/lapic.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -2921,9 +2921,8 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
29212921

29222922
apic->nr_lvt_entries = kvm_apic_calc_nr_lvt_entries(vcpu);
29232923

2924-
hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
2925-
HRTIMER_MODE_ABS_HARD);
2926-
apic->lapic_timer.timer.function = apic_timer_fn;
2924+
hrtimer_setup(&apic->lapic_timer.timer, apic_timer_fn, CLOCK_MONOTONIC,
2925+
HRTIMER_MODE_ABS_HARD);
29272926
if (lapic_timer_advance)
29282927
apic->lapic_timer.timer_advance_ns = LAPIC_TIMER_ADVANCE_NS_INIT;
29292928

‎arch/x86/kvm/vmx/nested.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -5327,9 +5327,8 @@ static int enter_vmx_operation(struct kvm_vcpu *vcpu)
53275327
if (enable_shadow_vmcs && !alloc_shadow_vmcs(vcpu))
53285328
goto out_shadow_vmcs;
53295329

5330-
hrtimer_init(&vmx->nested.preemption_timer, CLOCK_MONOTONIC,
5331-
HRTIMER_MODE_ABS_PINNED);
5332-
vmx->nested.preemption_timer.function = vmx_preemption_timer_fn;
5330+
hrtimer_setup(&vmx->nested.preemption_timer, vmx_preemption_timer_fn, CLOCK_MONOTONIC,
5331+
HRTIMER_MODE_ABS_PINNED);
53335332

53345333
vmx->nested.vpid02 = allocate_vpid();
53355334

‎arch/x86/kvm/xen.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2225,8 +2225,8 @@ void kvm_xen_init_vcpu(struct kvm_vcpu *vcpu)
22252225
vcpu->arch.xen.poll_evtchn = 0;
22262226

22272227
timer_setup(&vcpu->arch.xen.poll_timer, cancel_evtchn_poll, 0);
2228-
hrtimer_init(&vcpu->arch.xen.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
2229-
vcpu->arch.xen.timer.function = xen_timer_callback;
2228+
hrtimer_setup(&vcpu->arch.xen.timer, xen_timer_callback, CLOCK_MONOTONIC,
2229+
HRTIMER_MODE_ABS_HARD);
22302230

22312231
kvm_gpc_init(&vcpu->arch.xen.runstate_cache, vcpu->kvm);
22322232
kvm_gpc_init(&vcpu->arch.xen.runstate2_cache, vcpu->kvm);

‎block/bfq-iosched.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -7315,9 +7315,8 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
73157315

73167316
INIT_LIST_HEAD(&bfqd->dispatch);
73177317

7318-
hrtimer_init(&bfqd->idle_slice_timer, CLOCK_MONOTONIC,
7319-
HRTIMER_MODE_REL);
7320-
bfqd->idle_slice_timer.function = bfq_idle_slice_timer;
7318+
hrtimer_setup(&bfqd->idle_slice_timer, bfq_idle_slice_timer, CLOCK_MONOTONIC,
7319+
HRTIMER_MODE_REL);
73217320

73227321
bfqd->queue_weights_tree = RB_ROOT_CACHED;
73237322
#ifdef CONFIG_BFQ_GROUP_IOSCHED

‎block/blk-iocost.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -3004,8 +3004,7 @@ static void ioc_pd_init(struct blkg_policy_data *pd)
30043004
iocg->hweight_inuse = WEIGHT_ONE;
30053005

30063006
init_waitqueue_head(&iocg->waitq);
3007-
hrtimer_init(&iocg->waitq_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
3008-
iocg->waitq_timer.function = iocg_waitq_timer_fn;
3007+
hrtimer_setup(&iocg->waitq_timer, iocg_waitq_timer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
30093008

30103009
iocg->level = blkg->blkcg->css.cgroup->level;
30113010

‎drivers/ata/pata_octeon_cf.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -935,9 +935,8 @@ static int octeon_cf_probe(struct platform_device *pdev)
935935
ap->mwdma_mask = enable_dma ? ATA_MWDMA4 : 0;
936936

937937
/* True IDE mode needs a timer to poll for not-busy. */
938-
hrtimer_init(&cf_port->delayed_finish, CLOCK_MONOTONIC,
939-
HRTIMER_MODE_REL);
940-
cf_port->delayed_finish.function = octeon_cf_delayed_finish;
938+
hrtimer_setup(&cf_port->delayed_finish, octeon_cf_delayed_finish, CLOCK_MONOTONIC,
939+
HRTIMER_MODE_REL);
941940
} else {
942941
/* 16 bit but not True IDE */
943942
base = cs0 + 0x800;

‎drivers/base/power/runtime.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1764,8 +1764,8 @@ void pm_runtime_init(struct device *dev)
17641764
INIT_WORK(&dev->power.work, pm_runtime_work);
17651765

17661766
dev->power.timer_expires = 0;
1767-
hrtimer_init(&dev->power.suspend_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
1768-
dev->power.suspend_timer.function = pm_suspend_timer_fn;
1767+
hrtimer_setup(&dev->power.suspend_timer, pm_suspend_timer_fn, CLOCK_MONOTONIC,
1768+
HRTIMER_MODE_ABS);
17691769

17701770
init_waitqueue_head(&dev->power.wait_queue);
17711771
}

‎drivers/block/null_blk/main.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -1426,8 +1426,7 @@ static void nullb_setup_bwtimer(struct nullb *nullb)
14261426
{
14271427
ktime_t timer_interval = ktime_set(0, TIMER_INTERVAL);
14281428

1429-
hrtimer_init(&nullb->bw_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
1430-
nullb->bw_timer.function = nullb_bwtimer_fn;
1429+
hrtimer_setup(&nullb->bw_timer, nullb_bwtimer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
14311430
atomic_long_set(&nullb->cur_bytes, mb_per_tick(nullb->dev->mbps));
14321431
hrtimer_start(&nullb->bw_timer, timer_interval, HRTIMER_MODE_REL);
14331432
}
@@ -1604,8 +1603,8 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx,
16041603
might_sleep_if(hctx->flags & BLK_MQ_F_BLOCKING);
16051604

16061605
if (!is_poll && nq->dev->irqmode == NULL_IRQ_TIMER) {
1607-
hrtimer_init(&cmd->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
1608-
cmd->timer.function = null_cmd_timer_expired;
1606+
hrtimer_setup(&cmd->timer, null_cmd_timer_expired, CLOCK_MONOTONIC,
1607+
HRTIMER_MODE_REL);
16091608
}
16101609
cmd->error = BLK_STS_OK;
16111610
cmd->nq = nq;

‎drivers/char/hw_random/timeriomem-rng.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ static int timeriomem_rng_probe(struct platform_device *pdev)
152152

153153
priv->period = ns_to_ktime(period * NSEC_PER_USEC);
154154
init_completion(&priv->completion);
155-
hrtimer_init(&priv->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
156-
priv->timer.function = timeriomem_rng_trigger;
155+
hrtimer_setup(&priv->timer, timeriomem_rng_trigger, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
157156

158157
priv->rng_ops.name = dev_name(&pdev->dev);
159158
priv->rng_ops.read = timeriomem_rng_read;

‎drivers/devfreq/event/rockchip-dfi.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,7 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi)
642642
if (ret)
643643
return ret;
644644

645-
hrtimer_init(&dfi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
646-
dfi->timer.function = rockchip_dfi_timer;
645+
hrtimer_setup(&dfi->timer, rockchip_dfi_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
647646

648647
switch (dfi->ddr_type) {
649648
case ROCKCHIP_DDRTYPE_LPDDR2:

‎drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ static int amdgpu_vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
188188
amdgpu_crtc->connector = NULL;
189189
amdgpu_crtc->vsync_timer_enabled = AMDGPU_IRQ_STATE_DISABLE;
190190

191-
hrtimer_init(&amdgpu_crtc->vblank_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
192-
amdgpu_crtc->vblank_timer.function = &amdgpu_vkms_vblank_simulate;
191+
hrtimer_setup(&amdgpu_crtc->vblank_timer, &amdgpu_vkms_vblank_simulate, CLOCK_MONOTONIC,
192+
HRTIMER_MODE_REL);
193193

194194
return ret;
195195
}

‎drivers/gpu/drm/i915/gt/uc/intel_huc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ static void delayed_huc_load_init(struct intel_huc *huc)
231231
sw_fence_dummy_notify);
232232
i915_sw_fence_commit(&huc->delayed_load.fence);
233233

234-
hrtimer_init(&huc->delayed_load.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
235-
huc->delayed_load.timer.function = huc_delayed_load_timer_callback;
234+
hrtimer_setup(&huc->delayed_load.timer, huc_delayed_load_timer_callback, CLOCK_MONOTONIC,
235+
HRTIMER_MODE_REL);
236236
}
237237

238238
static void delayed_huc_load_fini(struct intel_huc *huc)

‎drivers/gpu/drm/i915/gvt/display.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,7 @@ static int setup_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num,
581581
vgpu->display.port_num = port_num;
582582

583583
/* Init hrtimer based on default refresh rate */
584-
hrtimer_init(&vblank_timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
585-
vblank_timer->timer.function = vblank_timer_fn;
584+
hrtimer_setup(&vblank_timer->timer, vblank_timer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
586585
vblank_timer->vrefresh_k = port->vrefresh_k;
587586
vblank_timer->period = DIV64_U64_ROUND_CLOSEST(NSEC_PER_SEC * MSEC_PER_SEC, vblank_timer->vrefresh_k);
588587

‎drivers/gpu/drm/i915/gvt/sched_policy.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ static int tbs_sched_init(struct intel_gvt *gvt)
286286
return -ENOMEM;
287287

288288
INIT_LIST_HEAD(&data->lru_runq_head);
289-
hrtimer_init(&data->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
290-
data->timer.function = tbs_timer_fn;
289+
hrtimer_setup(&data->timer, tbs_timer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
291290
data->period = GVT_DEFAULT_TIME_SLICE;
292291
data->gvt = gvt;
293292

‎drivers/gpu/drm/i915/i915_perf.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -3359,9 +3359,8 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
33593359
"opening stream oa config uuid=%s\n",
33603360
stream->oa_config->uuid);
33613361

3362-
hrtimer_init(&stream->poll_check_timer,
3363-
CLOCK_MONOTONIC, HRTIMER_MODE_REL);
3364-
stream->poll_check_timer.function = oa_poll_check_timer_cb;
3362+
hrtimer_setup(&stream->poll_check_timer, oa_poll_check_timer_cb, CLOCK_MONOTONIC,
3363+
HRTIMER_MODE_REL);
33653364
init_waitqueue_head(&stream->poll_wq);
33663365
spin_lock_init(&stream->oa_buffer.ptr_lock);
33673366
mutex_init(&stream->lock);

‎drivers/gpu/drm/i915/i915_pmu.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -1264,8 +1264,7 @@ void i915_pmu_register(struct drm_i915_private *i915)
12641264
int ret = -ENOMEM;
12651265

12661266
spin_lock_init(&pmu->lock);
1267-
hrtimer_init(&pmu->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
1268-
pmu->timer.function = i915_sample;
1267+
hrtimer_setup(&pmu->timer, i915_sample, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
12691268
pmu->cpuhp.cpu = -1;
12701269
init_rc6(pmu);
12711270

‎drivers/gpu/drm/i915/i915_request.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,7 @@ static void __rq_init_watchdog(struct i915_request *rq)
293293
{
294294
struct i915_request_watchdog *wdg = &rq->watchdog;
295295

296-
hrtimer_init(&wdg->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
297-
wdg->timer.function = __rq_watchdog_expired;
296+
hrtimer_setup(&wdg->timer, __rq_watchdog_expired, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
298297
}
299298

300299
static void __rq_arm_watchdog(struct i915_request *rq)

‎drivers/gpu/drm/i915/intel_uncore.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -2103,8 +2103,7 @@ static int __fw_domain_init(struct intel_uncore *uncore,
21032103

21042104
d->mask = BIT(domain_id);
21052105

2106-
hrtimer_init(&d->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
2107-
d->timer.function = intel_uncore_fw_release_timer;
2106+
hrtimer_setup(&d->timer, intel_uncore_fw_release_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
21082107

21092108
uncore->fw_domains |= BIT(domain_id);
21102109

‎drivers/gpu/drm/msm/msm_fence.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ msm_fence_context_alloc(struct drm_device *dev, volatile uint32_t *fenceptr,
6565
fctx->completed_fence = fctx->last_fence;
6666
*fctx->fenceptr = fctx->last_fence;
6767

68-
hrtimer_init(&fctx->deadline_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
69-
fctx->deadline_timer.function = deadline_timer;
68+
hrtimer_setup(&fctx->deadline_timer, deadline_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
7069

7170
kthread_init_work(&fctx->deadline_work, deadline_work);
7271

‎drivers/gpu/drm/msm/msm_io_utils.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ void msm_hrtimer_work_init(struct msm_hrtimer_work *work,
135135
clockid_t clock_id,
136136
enum hrtimer_mode mode)
137137
{
138-
hrtimer_init(&work->timer, clock_id, mode);
139-
work->timer.function = msm_hrtimer_worktimer;
138+
hrtimer_setup(&work->timer, msm_hrtimer_worktimer, clock_id, mode);
140139
work->worker = worker;
141140
kthread_init_work(&work->work, fn);
142141
}

0 commit comments

Comments
 (0)