]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tcp: Switch to use hrtimer_setup()
authorNam Cao <namcao@linutronix.de>
Wed, 5 Feb 2025 10:43:24 +0000 (11:43 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 18 Feb 2025 09:35:44 +0000 (10:35 +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/a16c227cc6882d8aecf658e6a7e38b74e7fd7573.1738746872.git.namcao@linutronix.de
net/ipv4/tcp_timer.c

index b412ed88ccd9a81a2689cf38f13899551b1078e3..e7a75afa995d4e19bc2eab0549b0e013cd549dd6 100644 (file)
@@ -884,11 +884,9 @@ void tcp_init_xmit_timers(struct sock *sk)
 {
        inet_csk_init_xmit_timers(sk, &tcp_write_timer, &tcp_delack_timer,
                                  &tcp_keepalive_timer);
-       hrtimer_init(&tcp_sk(sk)->pacing_timer, CLOCK_MONOTONIC,
-                    HRTIMER_MODE_ABS_PINNED_SOFT);
-       tcp_sk(sk)->pacing_timer.function = tcp_pace_kick;
+       hrtimer_setup(&tcp_sk(sk)->pacing_timer, tcp_pace_kick, CLOCK_MONOTONIC,
+                     HRTIMER_MODE_ABS_PINNED_SOFT);
 
-       hrtimer_init(&tcp_sk(sk)->compressed_ack_timer, CLOCK_MONOTONIC,
-                    HRTIMER_MODE_REL_PINNED_SOFT);
-       tcp_sk(sk)->compressed_ack_timer.function = tcp_compressed_ack_kick;
+       hrtimer_setup(&tcp_sk(sk)->compressed_ack_timer, tcp_compressed_ack_kick, CLOCK_MONOTONIC,
+                     HRTIMER_MODE_REL_PINNED_SOFT);
 }