]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
null_blk: Switch to use hrtimer_setup()
authorNam Cao <namcao@linutronix.de>
Wed, 5 Feb 2025 10:39:14 +0000 (11:39 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 18 Feb 2025 09:32:34 +0000 (10:32 +0100)
hrtimer_setup() takes the callback function pointer as argument and
initializes the timer completely.

Replace hrtimer_init() and the open coded initialization of
hrtimer::function with the new setup mechanism.

Patch was created by using Coccinelle.

Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/076cd30acb4b2d6b699f3c80463a8983530d4f06.1738746821.git.namcao@linutronix.de
drivers/block/null_blk/main.c

index d94ef37480bd457042c6e1ebef64604bc221ae09..16457330c1bc7ac8c6565d51ccbe137d0ed64c2f 100644 (file)
@@ -1426,8 +1426,7 @@ static void nullb_setup_bwtimer(struct nullb *nullb)
 {
        ktime_t timer_interval = ktime_set(0, TIMER_INTERVAL);
 
-       hrtimer_init(&nullb->bw_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-       nullb->bw_timer.function = nullb_bwtimer_fn;
+       hrtimer_setup(&nullb->bw_timer, nullb_bwtimer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        atomic_long_set(&nullb->cur_bytes, mb_per_tick(nullb->dev->mbps));
        hrtimer_start(&nullb->bw_timer, timer_interval, HRTIMER_MODE_REL);
 }
@@ -1604,8 +1603,8 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx,
        might_sleep_if(hctx->flags & BLK_MQ_F_BLOCKING);
 
        if (!is_poll && nq->dev->irqmode == NULL_IRQ_TIMER) {
-               hrtimer_init(&cmd->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-               cmd->timer.function = null_cmd_timer_expired;
+               hrtimer_setup(&cmd->timer, null_cmd_timer_expired, CLOCK_MONOTONIC,
+                             HRTIMER_MODE_REL);
        }
        cmd->error = BLK_STS_OK;
        cmd->nq = nq;