Skip to contentSkip to conversation

timers: Complete the timer_*() API renames

PATCH In review Ingo Molnar 5 participants 30 messages Apr 14, 2025 – Apr 16, 2025 Page 2 of 2

Subsystems (406)
lore
Share & tools
lore
#18 lore raw

PATCH 9/17 treewide, timers: Rename add_timer_on() => timer_add_on()

In reply to Ingo Molnar

Move this API to the canonical timer_*() namespace.

---
 Documentation/trace/ftrace.rst          | 4 ++--
 arch/powerpc/mm/book3s64/hash_utils.c   | 2 +-
 arch/x86/kernel/apic/vector.c           | 2 +-
 arch/x86/kernel/tsc_sync.c              | 2 +-
 drivers/char/random.c                   | 4 ++--
 drivers/cpufreq/powernv-cpufreq.c       | 2 +-
 drivers/irqchip/irq-riscv-imsic-state.c | 2 +-
 drivers/tty/mips_ejtag_fdc.c            | 4 ++--
 include/linux/timer.h                   | 4 ++--
 kernel/sched/core.c                     | 2 +-
 kernel/time/clocksource.c               | 4 ++--
 kernel/time/timer.c                     | 8 ++++----
 kernel/workqueue.c                      | 4 ++--
 13 files changed, 22 insertions(+), 22 deletions(-)
Documentation/trace/ftrace.rst +2 -2
index c9e88bf65709..2dda0e857883 100644
@@ -1215,8 +1215,8 @@ Here are the available options:
 	oldest events). When the annotate option is set, it will
 	display when a new CPU buffer started::
 
-			  <idle>-0     [001] dNs4 21169.031481: wake_up_idle_cpu <-add_timer_on
-			  <idle>-0     [001] dNs4 21169.031482: _raw_spin_unlock_irqrestore <-add_timer_on
+			  <idle>-0     [001] dNs4 21169.031481: wake_up_idle_cpu <-timer_add_on
+			  <idle>-0     [001] dNs4 21169.031482: _raw_spin_unlock_irqrestore <-timer_add_on
 			  <idle>-0     [001] .Ns4 21169.031484: sub_preempt_count <-_raw_spin_unlock_irqrestore
 		##### CPU 2 buffer started ####
 			  <idle>-0     [002] .N.1 21169.031484: rcu_idle_exit <-cpu_idle
arch/powerpc/mm/book3s64/hash_utils.c +1 -1
index 87b080bbd57c..a444d9db1f6f 100644
@@ -1294,7 +1294,7 @@ static void stress_hpt_timer_fn(struct timer_list *timer)
 	if (next_cpu >= nr_cpu_ids)
 		next_cpu = cpumask_first(cpu_online_mask);
 	stress_hpt_timer.expires = jiffies + msecs_to_jiffies(10);
-	add_timer_on(&stress_hpt_timer, next_cpu);
+	timer_add_on(&stress_hpt_timer, next_cpu);
 }
 
 static void __init htab_initialize(void)
arch/x86/kernel/apic/vector.c +1 -1
index 93069b13d3af..ad8b79b0d0d9 100644
@@ -1110,7 +1110,7 @@ static void __vector_schedule_cleanup(struct apic_chip_data *apicd)
 		 */
 		if (!timer_pending(&cl->timer)) {
 			cl->timer.expires = jiffies + 1;
-			add_timer_on(&cl->timer, cpu);
+			timer_add_on(&cl->timer, cpu);
 		}
 	} else {
 		pr_warn("IRQ %u schedule cleanup for offline CPU %u\n", apicd->irq, cpu);
arch/x86/kernel/tsc_sync.c +1 -1
index 982a407fb1fb..cec2120d52ae 100644
@@ -103,7 +103,7 @@ static void tsc_sync_check_timer_fn(struct timer_list *unused)
 		next_cpu = cpumask_first(cpu_online_mask);
 
 	tsc_sync_check_timer.expires += SYNC_CHECK_INTERVAL;
-	add_timer_on(&tsc_sync_check_timer, next_cpu);
+	timer_add_on(&tsc_sync_check_timer, next_cpu);
 }
 
 static int __init start_sync_check_timer(void)
drivers/char/random.c +2 -2
index 4ea4dccc7c46..225810db7d6f 100644
@@ -1130,7 +1130,7 @@ void add_interrupt_randomness(int irq)
 	fast_pool->count |= MIX_INFLIGHT;
 	if (!timer_pending(&fast_pool->mix)) {
 		fast_pool->mix.expires = jiffies;
-		add_timer_on(&fast_pool->mix, raw_smp_processor_id());
+		timer_add_on(&fast_pool->mix, raw_smp_processor_id());
 	}
 }
 EXPORT_SYMBOL_GPL(add_interrupt_randomness);
@@ -1342,7 +1342,7 @@ static void __cold try_to_generate_entropy(void)
 			/* Expiring the timer at `jiffies` means it's the next tick. */
 			stack->timer.expires = jiffies;
 
-			add_timer_on(&stack->timer, cpu);
+			timer_add_on(&stack->timer, cpu);
 
 			preempt_enable();
 		}
drivers/cpufreq/powernv-cpufreq.c +1 -1
index 1de7226db377..cf10804eef73 100644
@@ -683,7 +683,7 @@ static void gpstate_timer_handler(struct timer_list *t)
 	 */
 	if (!cpumask_test_cpu(raw_smp_processor_id(), policy->cpus)) {
 		gpstates->timer.expires = jiffies + msecs_to_jiffies(1);
-		add_timer_on(&gpstates->timer, cpumask_first(policy->cpus));
+		timer_add_on(&gpstates->timer, cpumask_first(policy->cpus));
 		spin_unlock(&gpstates->gpstate_lock);
 		return;
 	}
drivers/irqchip/irq-riscv-imsic-state.c +1 -1
index c39e573825d4..fcb4f90720a9 100644
@@ -214,7 +214,7 @@ static void __imsic_local_timer_start(struct imsic_local_priv *lpriv)
 
 	if (!timer_pending(&lpriv->timer)) {
 		lpriv->timer.expires = jiffies + 1;
-		add_timer_on(&lpriv->timer, smp_processor_id());
+		timer_add_on(&lpriv->timer, smp_processor_id());
 	}
 }
 #else
drivers/tty/mips_ejtag_fdc.c +2 -2
index 9c5d4ff8875c..6f2d3cf4f7cf 100644
@@ -1006,7 +1006,7 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)
 		 * Always attach the timer to the right CPU. The channels are
 		 * per-CPU so all polling should be from a single CPU.
 		 */
-		add_timer_on(&priv->poll_timer, dev->cpu);
+		timer_add_on(&priv->poll_timer, dev->cpu);
 
 		dev_info(priv->dev, "No usable IRQ, polling enabled\n");
 	}
@@ -1090,7 +1090,7 @@ static int mips_ejtag_fdc_tty_cpu_up(struct mips_cdmm_device *dev)
 	} else {
 		/* Restart poll timer */
 		priv->removing = false;
-		add_timer_on(&priv->poll_timer, dev->cpu);
+		timer_add_on(&priv->poll_timer, dev->cpu);
 	}
 
 	/* Restart the kthread */
include/linux/timer.h +2 -2
index 899dac465250..cc6903ba363f 100644
@@ -37,7 +37,7 @@
  * with interrupts disabled. Abuse is monitored!
  *
  * @TIMER_PINNED: A pinned timer will always expire on the CPU on which the
- * timer was enqueued. When a particular CPU is required, add_timer_on()
+ * timer was enqueued. When a particular CPU is required, timer_add_on()
  * has to be used. Enqueue via mod_timer() and timer_add() is always done
  * on the local CPU.
  */
@@ -147,7 +147,7 @@ static inline int timer_pending(const struct timer_list * timer)
 	return !hlist_unhashed_lockless(&timer->entry);
 }
 
-extern void add_timer_on(struct timer_list *timer, int cpu);
+extern void timer_add_on(struct timer_list *timer, int cpu);
 extern int mod_timer(struct timer_list *timer, unsigned long expires);
 extern int timer_mod_pending(struct timer_list *timer, unsigned long expires);
 extern int timer_reduce(struct timer_list *timer, unsigned long expires);
kernel/sched/core.c +1 -1
index c81cf642dba0..986b425b18a3 100644
@@ -1209,7 +1209,7 @@ int get_nohz_timer_target(void)
 }
 
 /*
- * When add_timer_on() enqueues a timer into the timer wheel of an
+ * When timer_add_on() enqueues a timer into the timer wheel of an
  * idle CPU then this timer might expire before the next timer event
  * which is scheduled to wake up that CPU. In case of a completely
  * idle system the next event might even be infinite time into the
kernel/time/clocksource.c +2 -2
index bb48498ebb5a..513f29693b5f 100644
@@ -599,7 +599,7 @@ static void clocksource_watchdog(struct timer_list *unused)
 	 */
 	if (!timer_pending(&watchdog_timer)) {
 		watchdog_timer.expires += WATCHDOG_INTERVAL + extra_wait;
-		add_timer_on(&watchdog_timer, next_cpu);
+		timer_add_on(&watchdog_timer, next_cpu);
 	}
 out:
 	spin_unlock(&watchdog_lock);
@@ -611,7 +611,7 @@ static inline void clocksource_start_watchdog(void)
 		return;
 	timer_setup(&watchdog_timer, clocksource_watchdog, 0);
 	watchdog_timer.expires = jiffies + WATCHDOG_INTERVAL;
-	add_timer_on(&watchdog_timer, cpumask_first(cpu_online_mask));
+	timer_add_on(&watchdog_timer, cpumask_first(cpu_online_mask));
 	watchdog_running = 1;
 }
 
kernel/time/timer.c +4 -4
index 67fdc84b2a30..c86cb7ca85f2 100644
@@ -1327,7 +1327,7 @@ void timer_add_global(struct timer_list *timer)
 EXPORT_SYMBOL(timer_add_global);
 
 /**
- * add_timer_on - Start a timer on a particular CPU
+ * timer_add_on - Start a timer on a particular CPU
  * @timer:	The timer to be started
  * @cpu:	The CPU to start it on
  *
@@ -1338,7 +1338,7 @@ EXPORT_SYMBOL(timer_add_global);
  *
  * See timer_add() for further details.
  */
-void add_timer_on(struct timer_list *timer, int cpu)
+void timer_add_on(struct timer_list *timer, int cpu)
 {
 	struct timer_base *new_base, *base;
 	unsigned long flags;
@@ -1382,7 +1382,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
 out_unlock:
 	raw_spin_unlock_irqrestore(&base->lock, flags);
 }
-EXPORT_SYMBOL_GPL(add_timer_on);
+EXPORT_SYMBOL_GPL(timer_add_on);
 
 /**
  * __timer_delete - Internal function: Deactivate a timer
@@ -1678,7 +1678,7 @@ static int __timer_delete_sync(struct timer_list *timer, bool shutdown)
  * otherwise this function is meaningless. It must not be called from
  * interrupt contexts unless the timer is an irqsafe one. The caller must
  * not hold locks which would prevent completion of the timer's callback
- * function. The timer's handler must not call add_timer_on(). Upon exit
+ * function. The timer's handler must not call timer_add_on(). Upon exit
  * the timer is not queued and the handler is not running on any CPU.
  *
  * For !irqsafe timers, the caller must not hold locks that are held in
kernel/workqueue.c +2 -2
index 5eb43f2d213b..ae4cbd1b2add 100644
@@ -2520,12 +2520,12 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
 		cpu = smp_processor_id();
 		if (!housekeeping_test_cpu(cpu, HK_TYPE_TIMER))
 			cpu = housekeeping_any_cpu(HK_TYPE_TIMER);
-		add_timer_on(timer, cpu);
+		timer_add_on(timer, cpu);
 	} else {
 		if (likely(cpu == WORK_CPU_UNBOUND))
 			timer_add_global(timer);
 		else
-			add_timer_on(timer, cpu);
+			timer_add_on(timer, cpu);
 	}
 }
 
Signature · 1 line
2.45.2
#19 lore raw

PATCH 10/17 treewide, timers: Rename mod_timer() => timer_mod()

In reply to Ingo Molnar

Move this API to the canonical timer_*() namespace.

---
 .../RCU/Design/Requirements/Requirements.rst       |  2 +-
 Documentation/RCU/rcu_dereference.rst              |  2 +-
 Documentation/core-api/local_ops.rst               |  4 +-
 Documentation/scsi/ChangeLog.lpfc                  |  6 +--
 .../translations/zh_CN/core-api/local_ops.rst      |  4 +-
 arch/alpha/kernel/srmcons.c                        |  4 +-
 arch/arm/mach-pxa/sharpsl_pm.c                     |  6 +--
 arch/mips/sgi-ip22/ip22-reset.c                    |  2 +-
 arch/mips/sgi-ip32/ip32-reset.c                    |  2 +-
 arch/powerpc/kvm/booke.c                           |  2 +-
 arch/powerpc/platforms/cell/spufs/sched.c          |  8 +--
 arch/s390/kernel/lgr.c                             |  2 +-
 arch/s390/kernel/time.c                            |  6 +--
 arch/s390/kernel/topology.c                        |  4 +-
 arch/s390/lib/test_unwind.c                        |  2 +-
 arch/s390/mm/cmm.c                                 |  2 +-
 arch/sh/boards/mach-highlander/psw.c               |  2 +-
 arch/sh/boards/mach-landisk/psw.c                  |  2 +-
 arch/sh/drivers/heartbeat.c                        |  4 +-
 arch/sparc/kernel/viohs.c                          |  2 +-
 arch/um/drivers/vector_kern.c                      |  2 +-
 arch/x86/kernel/apic/vector.c                      |  2 +-
 arch/x86/kernel/cpu/mce/core.c                     |  2 +-
 arch/x86/kvm/xen.c                                 |  2 +-
 arch/xtensa/platforms/iss/console.c                |  4 +-
 arch/xtensa/platforms/iss/network.c                |  4 +-
 arch/xtensa/platforms/xt2000/setup.c               |  4 +-
 block/blk-iolatency.c                              |  2 +-
 block/blk-mq.c                                     |  2 +-
 block/blk-stat.h                                   |  4 +-
 block/blk-throttle.c                               |  2 +-
 block/blk-timeout.c                                |  2 +-
 drivers/accel/qaic/qaic_timesync.c                 |  8 +--
 drivers/accessibility/speakup/main.c               |  4 +-
 drivers/accessibility/speakup/synth.c              |  2 +-
 drivers/ata/libahci.c                              |  4 +-
 drivers/atm/idt77105.c                             |  4 +-
 drivers/atm/idt77252.c                             | 12 ++---
 drivers/atm/iphase.c                               |  2 +-
 drivers/atm/lanai.c                                |  2 +-
 drivers/atm/nicstar.c                              |  2 +-
 drivers/atm/suni.c                                 |  2 +-
 drivers/auxdisplay/line-display.c                  |  2 +-
 drivers/auxdisplay/panel.c                         |  2 +-
 drivers/base/power/main.c                          |  2 +-
 drivers/base/power/wakeup.c                        |  2 +-
 drivers/block/amiflop.c                            |  6 +--
 drivers/block/aoe/aoemain.c                        |  2 +-
 drivers/block/ataflop.c                            | 14 +++---
 drivers/block/drbd/drbd_main.c                     |  2 +-
 drivers/block/drbd/drbd_nl.c                       |  4 +-
 drivers/block/drbd/drbd_receiver.c                 |  2 +-
 drivers/block/drbd/drbd_req.c                      |  2 +-
 drivers/block/drbd/drbd_state.c                    |  4 +-
 drivers/block/drbd/drbd_worker.c                   |  6 +--
 drivers/block/sunvdc.c                             |  2 +-
 drivers/bluetooth/bluecard_cs.c                    |  4 +-
 drivers/bluetooth/btnxpuart.c                      |  2 +-
 drivers/bluetooth/hci_bcsp.c                       |  2 +-
 drivers/bluetooth/hci_h5.c                         |  8 +--
 drivers/bluetooth/hci_qca.c                        |  8 +--
 drivers/bus/mhi/host/pci_generic.c                 | 10 ++--
 drivers/char/dtlk.c                                |  2 +-
 drivers/char/hangcheck-timer.c                     |  4 +-
 drivers/char/ipmi/ipmi_msghandler.c                |  6 +--
 drivers/char/ipmi/ipmi_si_intf.c                   |  2 +-
 drivers/char/ipmi/ipmi_ssif.c                      | 10 ++--
 drivers/char/ipmi/kcs_bmc_aspeed.c                 |  4 +-
 drivers/char/ipmi/ssif_bmc.c                       |  2 +-
 drivers/char/nwbutton.c                            |  2 +-
 drivers/char/tlclk.c                               |  2 +-
 drivers/char/tpm/tpm-dev-common.c                  |  4 +-
 drivers/comedi/drivers/comedi_test.c               |  4 +-
 drivers/comedi/drivers/das16.c                     |  2 +-
 drivers/cpufreq/powernv-cpufreq.c                  |  2 +-
 drivers/crypto/axis/artpec6_crypto.c               |  2 +-
 drivers/dma-buf/st-dma-fence.c                     |  2 +-
 drivers/dma/imx-dma.c                              |  2 +-
 drivers/dma/ioat/dma.c                             | 12 ++---
 drivers/firewire/core-transaction.c                |  2 +-
 drivers/firmware/psci/psci_checker.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c       |  2 +-
 drivers/gpu/drm/bridge/tda998x_drv.c               |  2 +-
 drivers/gpu/drm/drm_vblank.c                       |  2 +-
 drivers/gpu/drm/exynos/exynos_drm_vidi.c           |  4 +-
 drivers/gpu/drm/gud/gud_pipe.c                     |  2 +-
 drivers/gpu/drm/i915/gt/intel_rps.c                |  4 +-
 drivers/gpu/drm/i915/gt/mock_engine.c              |  4 +-
 drivers/gpu/drm/i915/gt/selftest_execlists.c       |  2 +-
 drivers/gpu/drm/i915/gt/selftest_migrate.c         |  2 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |  2 +-
 drivers/gpu/drm/i915/i915_utils.c                  |  2 +-
 drivers/gpu/drm/i915/intel_wakeref.c               |  2 +-
 drivers/gpu/drm/i915/selftests/lib_sw_fence.c      |  2 +-
 drivers/gpu/drm/mediatek/mtk_dp.c                  |  2 +-
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c          |  2 +-
 drivers/gpu/drm/msm/adreno/a6xx_preempt.c          |  2 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        |  2 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |  2 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c                  |  2 +-
 drivers/gpu/drm/ttm/tests/ttm_bo_test.c            |  2 +-
 drivers/gpu/drm/vc4/vc4_bo.c                       |  2 +-
 drivers/gpu/drm/vc4/vc4_gem.c                      |  2 +-
 drivers/gpu/drm/vgem/vgem_fence.c                  |  2 +-
 drivers/hid/hid-apple.c                            |  4 +-
 drivers/hid/hid-appleir.c                          |  4 +-
 drivers/hid/hid-appletb-kbd.c                      |  6 +--
 drivers/hid/hid-letsketch.c                        |  2 +-
 drivers/hid/hid-magicmouse.c                       |  4 +-
 drivers/hid/hid-multitouch.c                       |  2 +-
 drivers/hid/hid-nvidia-shield.c                    |  2 +-
 drivers/hid/hid-prodikeys.c                        |  2 +-
 drivers/hid/hid-sony.c                             |  4 +-
 drivers/hid/hid-uclogic-core.c                     |  2 +-
 drivers/hid/hid-wiimote-core.c                     |  6 +--
 drivers/hid/usbhid/hid-core.c                      |  2 +-
 drivers/hid/wacom_wac.c                            |  2 +-
 drivers/hsi/clients/ssi_protocol.c                 | 14 +++---
 drivers/hte/hte-tegra194-test.c                    |  4 +-
 drivers/hwmon/pwm-fan.c                            |  4 +-
 drivers/i2c/busses/i2c-img-scb.c                   |  6 +--
 drivers/iio/common/ssp_sensors/ssp_dev.c           |  4 +-
 drivers/infiniband/hw/hfi1/aspm.c                  |  2 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  8 +--
 drivers/infiniband/hw/hfi1/driver.c                |  2 +-
 drivers/infiniband/hw/hfi1/mad.c                   |  2 +-
 drivers/infiniband/hw/hfi1/sdma.c                  |  2 +-
 drivers/infiniband/hw/hfi1/tid_rdma.c              |  4 +-
 drivers/infiniband/hw/hfi1/verbs.c                 |  4 +-
 drivers/infiniband/hw/irdma/utils.c                |  4 +-
 drivers/infiniband/hw/mlx5/mr.c                    |  2 +-
 drivers/infiniband/hw/mthca/mthca_catas.c          |  2 +-
 drivers/infiniband/hw/qib/qib_driver.c             |  4 +-
 drivers/infiniband/hw/qib/qib_iba6120.c            |  8 +--
 drivers/infiniband/hw/qib/qib_iba7220.c            |  2 +-
 drivers/infiniband/hw/qib/qib_iba7322.c            |  2 +-
 drivers/infiniband/hw/qib/qib_init.c               |  6 +--
 drivers/infiniband/hw/qib/qib_intr.c               |  2 +-
 drivers/infiniband/hw/qib/qib_mad.c                |  2 +-
 drivers/infiniband/hw/qib/qib_sd7220.c             |  6 +--
 drivers/infiniband/hw/qib/qib_tx.c                 |  6 +--
 drivers/infiniband/hw/qib/qib_verbs.c              |  4 +-
 drivers/infiniband/sw/rxe/rxe_comp.c               |  4 +-
 drivers/infiniband/sw/rxe/rxe_req.c                |  2 +-
 drivers/input/ff-memless.c                         |  2 +-
 drivers/input/gameport/gameport.c                  |  4 +-
 drivers/input/input.c                              |  4 +-
 drivers/input/joystick/db9.c                       |  4 +-
 drivers/input/joystick/gamecon.c                   |  4 +-
 drivers/input/joystick/n64joy.c                    |  4 +-
 drivers/input/joystick/turbografx.c                |  4 +-
 drivers/input/keyboard/imx_keypad.c                |  6 +--
 drivers/input/keyboard/locomokbd.c                 |  2 +-
 drivers/input/keyboard/omap-keypad.c               |  2 +-
 drivers/input/keyboard/snvs_pwrkey.c               |  4 +-
 drivers/input/keyboard/tegra-kbc.c                 |  4 +-
 drivers/input/misc/nxp-bbnsm-pwrkey.c              |  4 +-
 drivers/input/mouse/alps.c                         |  2 +-
 drivers/input/mouse/byd.c                          |  2 +-
 drivers/input/serio/hil_mlc.c                      |  6 +--
 drivers/input/serio/hp_sdc.c                       |  2 +-
 drivers/input/touchscreen/ad7877.c                 |  2 +-
 drivers/input/touchscreen/ad7879.c                 |  2 +-
 drivers/input/touchscreen/bu21029_ts.c             |  2 +-
 drivers/input/touchscreen/exc3000.c                |  2 +-
 drivers/input/touchscreen/sx8654.c                 |  2 +-
 drivers/input/touchscreen/tsc200x-core.c           |  2 +-
 drivers/iommu/dma-iommu.c                          |  2 +-
 drivers/isdn/mISDN/l1oip_core.c                    |  4 +-
 drivers/leds/flash/leds-rt8515.c                   |  2 +-
 drivers/leds/flash/leds-sgm3140.c                  |  2 +-
 drivers/leds/led-core.c                            |  4 +-
 drivers/leds/trigger/ledtrig-activity.c            |  2 +-
 drivers/leds/trigger/ledtrig-heartbeat.c           |  2 +-
 drivers/leds/trigger/ledtrig-pattern.c             |  2 +-
 drivers/leds/trigger/ledtrig-transient.c           |  2 +-
 drivers/macintosh/smu.c                            |  2 +-
 drivers/mailbox/mailbox-altera.c                   |  4 +-
 drivers/md/dm-integrity.c                          |  2 +-
 drivers/md/dm-mpath.c                              |  2 +-
 drivers/md/dm-vdo/dedupe.c                         |  2 +-
 drivers/md/dm-writecache.c                         |  6 +--
 drivers/md/md.c                                    |  4 +-
 drivers/media/common/saa7146/saa7146_vbi.c         |  2 +-
 drivers/media/common/saa7146/saa7146_video.c       |  2 +-
 drivers/media/i2c/tc358743.c                       |  2 +-
 drivers/media/i2c/tvaudio.c                        |  4 +-
 drivers/media/pci/bt8xx/bttv-input.c               |  4 +-
 drivers/media/pci/bt8xx/bttv-risc.c                |  2 +-
 drivers/media/pci/cx18/cx18-mailbox.c              |  2 +-
 drivers/media/pci/cx18/cx18-streams.c              |  2 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c |  2 +-
 drivers/media/pci/saa7134/saa7134-input.c          |  2 +-
 drivers/media/pci/saa7134/saa7134-ts.c             |  2 +-
 drivers/media/pci/saa7134/saa7134-vbi.c            |  2 +-
 drivers/media/pci/saa7134/saa7134-video.c          |  2 +-
 drivers/media/pci/tw686x/tw686x-audio.c            |  2 +-
 drivers/media/pci/tw686x/tw686x-core.c             |  2 +-
 drivers/media/pci/tw686x/tw686x-video.c            |  2 +-
 drivers/media/rc/ene_ir.c                          |  2 +-
 drivers/media/rc/igorplugusb.c                     |  2 +-
 drivers/media/rc/img-ir/img-ir-hw.c                |  4 +-
 drivers/media/rc/img-ir/img-ir-raw.c               |  2 +-
 drivers/media/rc/imon.c                            |  2 +-
 drivers/media/rc/ir-mce_kbd-decoder.c              |  2 +-
 drivers/media/rc/rc-ir-raw.c                       |  4 +-
 drivers/media/rc/rc-main.c                         |  8 +--
 drivers/media/rc/serial_ir.c                       |  2 +-
 drivers/media/usb/au0828/au0828-dvb.c              |  2 +-
 drivers/media/usb/au0828/au0828-video.c            | 16 +++---
 drivers/media/usb/s2255/s2255drv.c                 |  2 +-
 drivers/memory/tegra/tegra210-emc-core.c           |  8 +--
 drivers/memstick/core/ms_block.c                   |  2 +-
 drivers/memstick/host/jmb38x_ms.c                  |  2 +-
 drivers/memstick/host/r592.c                       |  2 +-
 drivers/memstick/host/tifm_ms.c                    |  2 +-
 drivers/misc/bcm-vk/bcm_vk_tty.c                   |  4 +-
 drivers/mmc/core/host.c                            |  2 +-
 drivers/mmc/host/atmel-mci.c                       |  6 +--
 drivers/mmc/host/dw_mmc.c                          |  6 +--
 drivers/mmc/host/jz4740_mmc.c                      |  4 +-
 drivers/mmc/host/meson-mx-sdio.c                   |  2 +-
 drivers/mmc/host/mvsdio.c                          |  2 +-
 drivers/mmc/host/mxcmmc.c                          |  2 +-
 drivers/mmc/host/omap.c                            |  6 +--
 drivers/mmc/host/sdhci.c                           |  4 +-
 drivers/mmc/host/tifm_sd.c                         |  2 +-
 drivers/mmc/host/via-sdmmc.c                       |  2 +-
 drivers/mmc/host/vub300.c                          | 12 ++---
 drivers/mmc/host/wbsd.c                            |  2 +-
 drivers/most/most_usb.c                            |  2 +-
 drivers/mtd/sm_ftl.c                               |  2 +-
 drivers/net/arcnet/arcnet.c                        |  4 +-
 drivers/net/can/grcan.c                            |  2 +-
 drivers/net/can/kvaser_pciefd.c                    |  6 +--
 drivers/net/can/sja1000/peak_pcmcia.c              |  4 +-
 drivers/net/can/usb/peak_usb/pcan_usb.c            |  2 +-
 drivers/net/dsa/mv88e6xxx/phy.c                    |  2 +-
 drivers/net/dsa/sja1105/sja1105_ptp.c              |  2 +-
 drivers/net/ethernet/3com/3c515.c                  |  2 +-
 drivers/net/ethernet/3com/3c589_cs.c               |  2 +-
 drivers/net/ethernet/3com/3c59x.c                  |  8 +--
 drivers/net/ethernet/8390/axnet_cs.c               |  2 +-
 drivers/net/ethernet/8390/pcnet_cs.c               |  2 +-
 drivers/net/ethernet/agere/et131x.c                |  2 +-
 drivers/net/ethernet/amazon/ena/ena_netdev.c       |  6 +--
 drivers/net/ethernet/amd/a2065.c                   |  2 +-
 drivers/net/ethernet/amd/amd8111e.c                |  4 +-
 drivers/net/ethernet/amd/declance.c                |  2 +-
 drivers/net/ethernet/amd/pcnet32.c                 |  4 +-
 drivers/net/ethernet/amd/pds_core/main.c           |  6 +--
 drivers/net/ethernet/amd/sunlance.c                |  2 +-
 drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |  2 +-
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |  6 +--
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |  6 +--
 drivers/net/ethernet/atheros/ag71xx.c              |  2 +-
 drivers/net/ethernet/atheros/atlx/atl1.c           |  2 +-
 drivers/net/ethernet/atheros/atlx/atl2.c           |  6 +--
 drivers/net/ethernet/broadcom/b44.c                |  4 +-
 drivers/net/ethernet/broadcom/bcm63xx_enet.c       |  2 +-
 drivers/net/ethernet/broadcom/bnx2.c               |  8 +--
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  2 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  4 +-
 drivers/net/ethernet/brocade/bna/bfa_ioc.c         | 20 ++++----
 drivers/net/ethernet/brocade/bna/bnad.c            | 10 ++--
 drivers/net/ethernet/chelsio/cxgb/sge.c            | 10 ++--
 drivers/net/ethernet/chelsio/cxgb3/sge.c           |  8 +--
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c   |  4 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |  8 +--
 drivers/net/ethernet/chelsio/cxgb4vf/sge.c         |  8 +--
 drivers/net/ethernet/cisco/enic/enic_clsf.c        |  2 +-
 drivers/net/ethernet/cisco/enic/enic_clsf.h        |  2 +-
 drivers/net/ethernet/cisco/enic/enic_main.c        |  4 +-
 drivers/net/ethernet/dec/tulip/21142.c             |  4 +-
 drivers/net/ethernet/dec/tulip/de2104x.c           |  8 +--
 drivers/net/ethernet/dec/tulip/interrupt.c         |  6 +--
 drivers/net/ethernet/dec/tulip/pnic.c              |  2 +-
 drivers/net/ethernet/dec/tulip/pnic2.c             |  2 +-
 drivers/net/ethernet/dec/tulip/timer.c             | 10 ++--
 drivers/net/ethernet/dec/tulip/winbond-840.c       |  2 +-
 drivers/net/ethernet/google/gve/gve_ethtool.c      |  2 +-
 drivers/net/ethernet/google/gve/gve_main.c         |  4 +-
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      |  4 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c    |  4 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c  |  2 +-
 drivers/net/ethernet/intel/e100.c                  |  6 +--
 drivers/net/ethernet/intel/e1000e/netdev.c         | 12 ++---
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |  6 +--
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  8 +--
 drivers/net/ethernet/intel/ice/ice_main.c          | 12 ++---
 drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c |  2 +-
 drivers/net/ethernet/intel/igb/igb_main.c          | 14 +++---
 drivers/net/ethernet/intel/igbvf/netdev.c          |  8 +--
 drivers/net/ethernet/intel/igc/igc_main.c          | 14 +++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  4 +-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |  4 +-
 drivers/net/ethernet/korina.c                      |  4 +-
 drivers/net/ethernet/marvell/mv643xx_eth.c         |  4 +-
 drivers/net/ethernet/marvell/skge.c                |  6 +--
 drivers/net/ethernet/marvell/sky2.c                |  4 +-
 drivers/net/ethernet/mellanox/mlx4/catas.c         |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/health.c   |  2 +-
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |  2 +-
 drivers/net/ethernet/natsemi/natsemi.c             |  8 +--
 drivers/net/ethernet/natsemi/ns83820.c             |  4 +-
 drivers/net/ethernet/neterion/s2io.c               |  4 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |  2 +-
 drivers/net/ethernet/nvidia/forcedeth.c            | 28 +++++------
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |  4 +-
 drivers/net/ethernet/pasemi/pasemi_mac.c           |  6 +--
 .../net/ethernet/pensando/ionic/ionic_bus_pci.c    |  4 +-
 drivers/net/ethernet/pensando/ionic/ionic_dev.c    |  2 +-
 drivers/net/ethernet/pensando/ionic/ionic_lif.c    |  2 +-
 drivers/net/ethernet/qlogic/qla3xxx.c              |  6 +--
 drivers/net/ethernet/realtek/atp.c                 |  2 +-
 drivers/net/ethernet/rocker/rocker_ofdpa.c         |  6 +--
 drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |  6 +--
 drivers/net/ethernet/sfc/falcon/efx.c              |  2 +-
 drivers/net/ethernet/sfc/falcon/falcon.c           |  2 +-
 drivers/net/ethernet/sfc/mcdi.c                    |  4 +-
 drivers/net/ethernet/sfc/rx_common.c               |  2 +-
 drivers/net/ethernet/sfc/siena/mcdi.c              |  4 +-
 drivers/net/ethernet/sfc/siena/rx_common.c         |  2 +-
 drivers/net/ethernet/sis/sis190.c                  |  4 +-
 drivers/net/ethernet/smsc/smc91c92_cs.c            |  2 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c   |  4 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  2 +-
 drivers/net/ethernet/sun/cassini.c                 | 10 ++--
 drivers/net/ethernet/sun/sungem.c                  |  6 +--
 drivers/net/ethernet/sun/sunvnet_common.c          |  6 +--
 drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c      |  2 +-
 drivers/net/ethernet/ti/tlan.c                     |  2 +-
 drivers/net/ethernet/tundra/tsi108_eth.c           |  4 +-
 drivers/net/hamradio/6pack.c                       |  8 +--
 drivers/net/ntb_netdev.c                           |  4 +-
 drivers/net/phy/phylink.c                          |  6 +--
 drivers/net/slip/slip.c                            | 12 ++---
 drivers/net/tun.c                                  |  6 +--
 drivers/net/usb/catc.c                             |  4 +-
 drivers/net/usb/lan78xx.c                          |  8 +--
 drivers/net/usb/usbnet.c                           |  4 +-
 drivers/net/vxlan/vxlan_core.c                     |  6 +--
 drivers/net/wan/hdlc_ppp.c                         |  6 +--
 drivers/net/wireguard/timers.c                     |  2 +-
 drivers/net/wireless/ath/ar5523/ar5523.c           |  4 +-
 drivers/net/wireless/ath/ath10k/htt_rx.c           |  4 +-
 drivers/net/wireless/ath/ath10k/pci.c              |  4 +-
 drivers/net/wireless/ath/ath10k/sdio.c             |  2 +-
 drivers/net/wireless/ath/ath10k/snoc.c             |  2 +-
 drivers/net/wireless/ath/ath11k/ce.c               |  4 +-
 drivers/net/wireless/ath/ath11k/dp.c               |  4 +-
 drivers/net/wireless/ath/ath11k/dp_rx.c            |  6 +--
 drivers/net/wireless/ath/ath11k/dp_tx.c            |  2 +-
 drivers/net/wireless/ath/ath11k/mac.c              |  2 +-
 drivers/net/wireless/ath/ath12k/ce.c               |  4 +-
 drivers/net/wireless/ath/ath12k/dp.c               |  2 +-
 drivers/net/wireless/ath/ath12k/dp_rx.c            |  2 +-
 drivers/net/wireless/ath/ath6kl/cfg80211.c         |  2 +-
 drivers/net/wireless/ath/ath6kl/recovery.c         |  8 +--
 drivers/net/wireless/ath/ath6kl/txrx.c             |  4 +-
 drivers/net/wireless/ath/ath6kl/wmi.c              |  2 +-
 drivers/net/wireless/ath/ath9k/channel.c           |  8 +--
 drivers/net/wireless/ath/ath9k/gpio.c              |  6 +--
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |  6 +--
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |  2 +-
 drivers/net/wireless/ath/ath9k/link.c              |  4 +-
 drivers/net/wireless/ath/ath9k/main.c              |  2 +-
 drivers/net/wireless/ath/wcn36xx/dxe.c             |  2 +-
 drivers/net/wireless/ath/wil6210/cfg80211.c        |  6 +--
 drivers/net/wireless/ath/wil6210/p2p.c             |  4 +-
 drivers/net/wireless/atmel/at76c50x-usb.c          |  4 +-
 .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c  |  6 +--
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |  2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  4 +-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  4 +-
 drivers/net/wireless/intel/iwlegacy/3945-rs.c      |  4 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |  2 +-
 drivers/net/wireless/intel/iwlegacy/common.c       |  4 +-
 drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c   |  2 +-
 drivers/net/wireless/intel/iwlwifi/dvm/main.c      |  4 +-
 drivers/net/wireless/intel/iwlwifi/dvm/rx.c        |  2 +-
 drivers/net/wireless/intel/iwlwifi/dvm/tt.c        |  6 +--
 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c   |  4 +-
 drivers/net/wireless/intel/iwlwifi/mld/agg.c       |  4 +-
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |  4 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c  |  4 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |  8 +--
 drivers/net/wireless/marvell/libertas/cmd.c        |  2 +-
 drivers/net/wireless/marvell/libertas/if_usb.c     |  2 +-
 drivers/net/wireless/marvell/libertas/main.c       |  2 +-
 drivers/net/wireless/marvell/libertas_tf/cmd.c     |  2 +-
 drivers/net/wireless/marvell/libertas_tf/if_usb.c  |  2 +-
 .../net/wireless/marvell/mwifiex/11n_rxreorder.c   |  2 +-
 drivers/net/wireless/marvell/mwifiex/cmdevt.c      |  2 +-
 drivers/net/wireless/marvell/mwifiex/main.c        |  2 +-
 drivers/net/wireless/marvell/mwifiex/tdls.c        |  4 +-
 drivers/net/wireless/marvell/mwifiex/usb.c         |  6 +--
 drivers/net/wireless/mediatek/mt76/mt7615/mcu.c    |  2 +-
 drivers/net/wireless/mediatek/mt76/mt7921/main.c   |  2 +-
 drivers/net/wireless/mediatek/mt76/mt7921/mcu.c    |  2 +-
 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c    |  2 +-
 drivers/net/wireless/microchip/wilc1000/cfg80211.c |  2 +-
 drivers/net/wireless/microchip/wilc1000/hif.c      |  8 +--
 drivers/net/wireless/purelifi/plfxlc/usb.c         |  4 +-
 drivers/net/wireless/realtek/rtlwifi/base.c        |  2 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c    |  2 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c    |  6 +--
 .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c    |  6 +--
 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |  6 +--
 .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c    |  6 +--
 drivers/net/wireless/realtek/rtw88/tx.c            |  2 +-
 drivers/net/wireless/st/cw1200/pm.c                |  2 +-
 drivers/net/wireless/st/cw1200/queue.c             |  4 +-
 drivers/net/wireless/st/cw1200/sta.c               |  2 +-
 drivers/net/wireless/ti/wlcore/main.c              |  2 +-
 drivers/net/wireless/ti/wlcore/tx.c                |  2 +-
 drivers/net/xen-netback/netback.c                  |  2 +-
 drivers/net/xen-netfront.c                         |  2 +-
 drivers/nfc/nfcmrvl/fw_dnld.c                      |  2 +-
 drivers/nfc/pn533/pn533.c                          |  4 +-
 drivers/nfc/pn533/uart.c                           |  2 +-
 drivers/nfc/st-nci/ndlc.c                          |  8 +--
 drivers/nfc/st-nci/se.c                            |  8 +--
 drivers/nfc/st21nfca/core.c                        |  2 +-
 drivers/nfc/st21nfca/se.c                          |  6 +--
 drivers/nvme/host/multipath.c                      |  2 +-
 drivers/parport/ieee1284.c                         |  2 +-
 drivers/pcmcia/bcm63xx_pcmcia.c                    |  4 +-
 drivers/pcmcia/electra_cf.c                        |  2 +-
 drivers/pcmcia/omap_cf.c                           |  4 +-
 drivers/pcmcia/pd6729.c                            |  4 +-
 drivers/pcmcia/soc_common.c                        |  2 +-
 drivers/pcmcia/yenta_socket.c                      |  2 +-
 drivers/platform/mellanox/mlxbf-tmfifo.c           |  4 +-
 drivers/platform/x86/intel_ips.c                   |  2 +-
 drivers/platform/x86/sony-laptop.c                 |  4 +-
 drivers/pps/clients/pps-ktimer.c                   |  4 +-
 drivers/pps/generators/pps_gen-dummy.c             |  2 +-
 drivers/ptp/ptp_ocp.c                              |  4 +-
 drivers/s390/block/dasd.c                          |  4 +-
 drivers/s390/char/con3270.c                        |  2 +-
 drivers/s390/char/sclp.c                           |  4 +-
 drivers/s390/char/sclp_con.c                       |  2 +-
 drivers/s390/char/sclp_tty.c                       |  2 +-
 drivers/s390/char/tape_std.c                       |  2 +-
 drivers/s390/cio/device.c                          |  4 +-
 drivers/s390/cio/device_fsm.c                      |  2 +-
 drivers/s390/cio/eadm_sch.c                        |  2 +-
 drivers/s390/crypto/ap_bus.c                       |  4 +-
 drivers/s390/crypto/ap_queue.c                     |  4 +-
 drivers/scsi/arcmsr/arcmsr_hba.c                   | 10 ++--
 drivers/scsi/arm/fas216.c                          |  4 +-
 drivers/scsi/be2iscsi/be_main.c                    |  6 +--
 drivers/scsi/bfa/bfad.c                            |  4 +-
 drivers/scsi/bnx2fc/bnx2fc_tgt.c                   |  4 +-
 drivers/scsi/csiostor/csio_hw.c                    |  2 +-
 drivers/scsi/csiostor/csio_mb.c                    |  2 +-
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c                 |  2 +-
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |  2 +-
 drivers/scsi/elx/efct/efct_xport.c                 |  2 +-
 drivers/scsi/elx/libefc/efc_els.c                  |  2 +-
 drivers/scsi/elx/libefc/efc_fabric.c               |  2 +-
 drivers/scsi/fcoe/fcoe_ctlr.c                      | 12 ++---
 drivers/scsi/fcoe/fcoe_transport.c                 |  2 +-
 drivers/scsi/fnic/fdls_disc.c                      | 10 ++--
 drivers/scsi/fnic/fip.c                            | 22 ++++----
 drivers/scsi/fnic/fnic_main.c                      |  4 +-
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c             |  2 +-
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c             |  6 +--
 drivers/scsi/ibmvscsi/ibmvfc.c                     |  2 +-
 drivers/scsi/isci/isci.h                           |  2 +-
 drivers/scsi/libfc/fc_fcp.c                        |  2 +-
 drivers/scsi/libiscsi.c                            |  6 +--
 drivers/scsi/lpfc/lpfc_els.c                       | 14 +++---
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |  2 +-
 drivers/scsi/lpfc/lpfc_init.c                      | 18 +++----
 drivers/scsi/lpfc/lpfc_nportdisc.c                 | 14 +++---
 drivers/scsi/lpfc/lpfc_scsi.c                      |  2 +-
 drivers/scsi/lpfc/lpfc_sli.c                       | 20 ++++----
 drivers/scsi/lpfc/lpfc_vmid.c                      |  2 +-
 drivers/scsi/megaraid/megaraid_sas_base.c          |  2 +-
 drivers/scsi/qla1280.c                             |  2 +-
 drivers/scsi/qla2xxx/qla_os.c                      |  2 +-
 drivers/scsi/qla4xxx/ql4_os.c                      |  4 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |  2 +-
 .../staging/gpib/agilent_82357a/agilent_82357a.c   |  4 +-
 drivers/staging/gpib/common/gpib_os.c              |  6 +--
 drivers/staging/gpib/common/iblib.c                |  2 +-
 drivers/staging/gpib/ni_usb/ni_usb_gpib.c          |  4 +-
 drivers/staging/media/imx/imx-ic-prpencvf.c        |  4 +-
 drivers/staging/media/imx/imx-media-csi.c          |  4 +-
 .../rtl8723bs/include/osdep_service_linux.h        |  2 +-
 drivers/target/iscsi/iscsi_target_erl0.c           |  2 +-
 drivers/target/iscsi/iscsi_target_erl1.c           |  4 +-
 drivers/target/iscsi/iscsi_target_util.c           |  8 +--
 drivers/target/target_core_user.c                  |  4 +-
 drivers/tty/ipwireless/hardware.c                  |  2 +-
 drivers/tty/mips_ejtag_fdc.c                       |  2 +-
 drivers/tty/moxa.c                                 |  4 +-
 drivers/tty/n_gsm.c                                | 24 ++++-----
 drivers/tty/serial/8250/8250_aspeed_vuart.c        |  4 +-
 drivers/tty/serial/8250/8250_core.c                |  8 +--
 drivers/tty/serial/altera_uart.c                   |  4 +-
 drivers/tty/serial/amba-pl011.c                    |  6 +--
 drivers/tty/serial/atmel_serial.c                  |  6 +--
 drivers/tty/serial/fsl_lpuart.c                    |  4 +-
 drivers/tty/serial/imx.c                           |  4 +-
 drivers/tty/serial/liteuart.c                      |  4 +-
 drivers/tty/serial/max3100.c                       |  4 +-
 drivers/tty/serial/mux.c                           |  4 +-
 drivers/tty/serial/sa1100.c                        |  4 +-
 drivers/tty/serial/sccnxp.c                        |  4 +-
 drivers/tty/serial/sh-sci.c                        |  2 +-
 drivers/tty/synclink_gt.c                          |  4 +-
 drivers/tty/sysrq.c                                |  2 +-
 drivers/tty/vt/keyboard.c                          |  2 +-
 drivers/tty/vt/vt.c                                |  8 +--
 drivers/usb/atm/cxacru.c                           |  2 +-
 drivers/usb/atm/speedtch.c                         |  8 +--
 drivers/usb/atm/usbatm.c                           |  4 +-
 drivers/usb/core/hcd.c                             |  8 +--
 drivers/usb/core/hub.c                             |  2 +-
 drivers/usb/dwc2/core_intr.c                       |  2 +-
 drivers/usb/dwc2/hcd.c                             |  4 +-
 drivers/usb/dwc2/hcd_queue.c                       |  2 +-
 drivers/usb/fotg210/fotg210-hcd.c                  |  4 +-
 drivers/usb/gadget/legacy/zero.c                   |  2 +-
 drivers/usb/gadget/udc/at91_udc.c                  |  4 +-
 drivers/usb/gadget/udc/dummy_hcd.c                 |  2 +-
 drivers/usb/gadget/udc/m66592-udc.c                |  8 +--
 drivers/usb/gadget/udc/omap_udc.c                  |  4 +-
 drivers/usb/gadget/udc/pxa25x_udc.h                |  2 +-
 drivers/usb/gadget/udc/r8a66597-udc.c              |  8 +--
 drivers/usb/gadget/udc/snps_udc_core.c             | 12 ++---
 drivers/usb/host/ehci-hcd.c                        |  2 +-
 drivers/usb/host/ehci-hub.c                        |  4 +-
 drivers/usb/host/ehci-platform.c                   |  4 +-
 drivers/usb/host/isp116x-hcd.c                     |  2 +-
 drivers/usb/host/ohci-hcd.c                        |  4 +-
 drivers/usb/host/oxu210hp-hcd.c                    |  6 +--
 drivers/usb/host/r8a66597-hcd.c                    |  8 +--
 drivers/usb/host/sl811-hcd.c                       |  4 +-
 drivers/usb/host/uhci-hcd.c                        |  4 +-
 drivers/usb/host/uhci-hub.c                        |  2 +-
 drivers/usb/host/uhci-q.c                          |  4 +-
 drivers/usb/host/xen-hcd.c                         |  2 +-
 drivers/usb/host/xhci-hub.c                        |  2 +-
 drivers/usb/host/xhci-ring.c                       |  2 +-
 drivers/usb/host/xhci.c                            |  2 +-
 drivers/usb/isp1760/isp1760-hcd.c                  |  2 +-
 drivers/usb/isp1760/isp1760-udc.c                  |  4 +-
 drivers/usb/misc/usbtest.c                         |  2 +-
 drivers/usb/musb/da8xx.c                           | 10 ++--
 drivers/usb/musb/mpfs.c                            | 10 ++--
 drivers/usb/musb/musb_core.c                       |  4 +-
 drivers/usb/musb/musb_dsps.c                       |  2 +-
 drivers/usb/musb/musb_virthub.c                    |  2 +-
 drivers/usb/musb/tusb6010.c                        |  2 +-
 drivers/usb/serial/garmin_gps.c                    |  2 +-
 drivers/usb/serial/mos7840.c                       |  4 +-
 drivers/usb/storage/realtek_cr.c                   |  2 +-
 drivers/usb/usbip/vudc_transfer.c                  |  4 +-
 drivers/video/fbdev/aty/radeon_backlight.c         |  4 +-
 drivers/video/fbdev/aty/radeon_base.c              |  4 +-
 drivers/video/fbdev/omap/hwa742.c                  |  2 +-
 drivers/video/fbdev/omap2/omapfb/dss/dsi.c         |  2 +-
 drivers/video/fbdev/pxa3xx-gcu.c                   |  2 +-
 drivers/virt/vboxguest/vboxguest_core.c            |  4 +-
 drivers/watchdog/alim7101_wdt.c                    |  4 +-
 drivers/watchdog/at91sam9_wdt.c                    |  4 +-
 drivers/watchdog/bcm47xx_wdt.c                     |  2 +-
 drivers/watchdog/lpc18xx_wdt.c                     |  2 +-
 drivers/watchdog/machzwd.c                         |  4 +-
 drivers/watchdog/mixcomwd.c                        |  4 +-
 drivers/watchdog/mtx-1_wdt.c                       |  4 +-
 drivers/watchdog/pcwd.c                            |  4 +-
 drivers/watchdog/pika_wdt.c                        |  4 +-
 drivers/watchdog/rdc321x_wdt.c                     |  4 +-
 drivers/watchdog/sbc60xxwdt.c                      |  4 +-
 drivers/watchdog/sc520_wdt.c                       |  4 +-
 drivers/watchdog/shwdt.c                           |  4 +-
 drivers/watchdog/via_wdt.c                         |  6 +--
 drivers/watchdog/w83877f_wdt.c                     |  4 +-
 fs/afs/server.c                                    |  2 +-
 fs/bcachefs/clock.c                                |  2 +-
 fs/btrfs/zstd.c                                    |  4 +-
 fs/dlm/lock.c                                      |  4 +-
 fs/ext4/super.c                                    |  6 +--
 fs/lockd/svclock.c                                 |  2 +-
 fs/ocfs2/cluster/tcp.c                             |  2 +-
 fs/pstore/platform.c                               |  2 +-
 include/linux/timer.h                              |  4 +-
 include/net/cfg80211.h                             |  4 +-
 include/rdma/rdmavt_qp.h                           |  2 +-
 kernel/events/uprobes.c                            |  2 +-
 kernel/irq/spurious.c                              |  4 +-
 kernel/kcsan/kcsan_test.c                          |  2 +-
 kernel/rcu/rcutorture.c                            |  2 +-
 kernel/rcu/tasks.h                                 |  4 +-
 kernel/rcu/tree_nocb.h                             |  6 +--
 kernel/sched/psi.c                                 |  2 +-
 kernel/time/timer.c                                | 16 +++---
 kernel/workqueue.c                                 | 14 +++---
 lib/test_ref_tracker.c                             |  2 +-
 mm/page-writeback.c                                |  6 +--
 net/802/garp.c                                     |  2 +-
 net/802/mrp.c                                      |  4 +-
 net/appletalk/aarp.c                               |  8 +--
 net/atm/clip.c                                     |  4 +-
 net/atm/lec.c                                      |  2 +-
 net/ax25/ax25_ds_timer.c                           |  2 +-
 net/ax25/ax25_timer.c                              | 10 ++--
 net/batman-adv/tp_meter.c                          |  4 +-
 net/bluetooth/hidp/core.c                          |  2 +-
 net/bluetooth/rfcomm/core.c                        |  4 +-
 net/bridge/br_mdb.c                                | 14 +++---
 net/bridge/br_multicast.c                          | 58 +++++++++++-----------
 net/bridge/br_multicast_eht.c                      |  6 +--
 net/bridge/br_stp.c                                | 16 +++---
 net/bridge/br_stp_if.c                             |  4 +-
 net/bridge/br_stp_timer.c                          |  6 +--
 net/can/af_can.c                                   |  2 +-
 net/can/proc.c                                     |  2 +-
 net/core/drop_monitor.c                            |  4 +-
 net/core/gen_estimator.c                           |  4 +-
 net/core/neighbour.c                               |  8 +--
 net/core/sock.c                                    |  2 +-
 net/hsr/hsr_device.c                               | 12 ++---
 net/hsr/hsr_framereg.c                             |  4 +-
 net/ipv4/igmp.c                                    |  6 +--
 net/ipv4/inet_connection_sock.c                    |  4 +-
 net/ipv4/inet_fragment.c                           |  2 +-
 net/ipv4/inet_timewait_sock.c                      |  4 +-
 net/ipv4/ip_fragment.c                             |  2 +-
 net/ipv4/ipmr.c                                    |  6 +--
 net/ipv4/tcp.c                                     |  4 +-
 net/ipv6/addrconf.c                                |  2 +-
 net/ipv6/ip6_fib.c                                 |  8 +--
 net/ipv6/ip6_flowlabel.c                           |  4 +-
 net/ipv6/ip6mr.c                                   |  4 +-
 net/llc/llc_c_ac.c                                 | 12 ++---
 net/mac80211/agg-rx.c                              |  4 +-
 net/mac80211/agg-tx.c                              |  6 +--
 net/mac80211/ibss.c                                |  6 +--
 net/mac80211/led.c                                 |  4 +-
 net/mac80211/mesh.c                                |  4 +-
 net/mac80211/mesh_hwmp.c                           |  4 +-
 net/mac80211/mesh_plink.c                          |  4 +-
 net/mac80211/mlme.c                                | 18 +++----
 net/mac80211/ocb.c                                 |  2 +-
 net/mac80211/offchannel.c                          |  2 +-
 net/mac80211/rx.c                                  |  6 +--
 net/mac80211/sta_info.c                            |  2 +-
 net/mac80211/status.c                              |  4 +-
 net/mac80211/tx.c                                  |  4 +-
 net/mac80211/util.c                                |  2 +-
 net/mctp/af_mctp.c                                 |  2 +-
 net/ncsi/ncsi-cmd.c                                |  2 +-
 net/ncsi/ncsi-manage.c                             |  4 +-
 net/netfilter/ipset/ip_set_bitmap_gen.h            |  2 +-
 net/netfilter/ipset/ip_set_list_set.c              |  2 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |  2 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |  4 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |  4 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |  4 +-
 net/netfilter/xt_IDLETIMER.c                       | 12 ++---
 net/netfilter/xt_LED.c                             |  2 +-
 net/netrom/nr_loopback.c                           |  4 +-
 net/nfc/core.c                                     |  6 +--
 net/nfc/hci/core.c                                 |  2 +-
 net/nfc/hci/llc_shdlc.c                            |  8 +--
 net/nfc/llcp_commands.c                            |  2 +-
 net/nfc/llcp_core.c                                |  6 +--
 net/nfc/nci/core.c                                 |  4 +-
 net/packet/af_packet.c                             |  2 +-
 net/rose/rose_loopback.c                           |  4 +-
 net/sched/cls_flow.c                               |  4 +-
 net/sched/sch_fq_pie.c                             |  4 +-
 net/sched/sch_generic.c                            |  4 +-
 net/sched/sch_pie.c                                |  4 +-
 net/sched/sch_red.c                                |  4 +-
 net/sched/sch_sfq.c                                |  4 +-
 net/sctp/associola.c                               |  2 +-
 net/sctp/input.c                                   |  2 +-
 net/sctp/output.c                                  |  2 +-
 net/sctp/outqueue.c                                |  2 +-
 net/sctp/protocol.c                                |  4 +-
 net/sctp/sm_sideeffect.c                           | 16 +++---
 net/sctp/transport.c                               | 12 ++---
 net/sunrpc/svc_xprt.c                              |  6 +--
 net/sunrpc/xprt.c                                  |  4 +-
 net/tipc/discover.c                                | 10 ++--
 net/tipc/monitor.c                                 |  4 +-
 net/tipc/node.c                                    |  6 +--
 net/tipc/subscr.c                                  |  2 +-
 net/wireless/core.c                                |  2 +-
 net/x25/x25_link.c                                 |  2 +-
 net/x25/x25_timer.c                                | 10 ++--
 net/xfrm/xfrm_policy.c                             | 10 ++--
 net/xfrm/xfrm_replay.c                             |  6 +--
 net/xfrm/xfrm_state.c                              |  2 +-
 samples/connector/cn_test.c                        |  4 +-
 samples/ftrace/sample-trace-array.c                |  2 +-
 security/keys/gc.c                                 |  2 +-
 sound/core/timer.c                                 |  2 +-
 sound/drivers/aloop.c                              |  2 +-
 sound/drivers/dummy.c                              |  2 +-
 sound/drivers/mpu401/mpu401_uart.c                 |  4 +-
 sound/drivers/mtpav.c                              |  4 +-
 sound/drivers/opl3/opl3_midi.c                     |  4 +-
 sound/drivers/pcmtest.c                            |  4 +-
 sound/drivers/serial-u16550.c                      |  2 +-
 sound/i2c/other/ak4117.c                           |  4 +-
 sound/isa/sb/emu8000_pcm.c                         |  4 +-
 sound/isa/sb/sb8_midi.c                            |  4 +-
 sound/isa/wavefront/wavefront_midi.c               |  4 +-
 sound/pci/asihpi/asihpi.c                          |  2 +-
 sound/pci/ctxfi/cttimer.c                          |  4 +-
 sound/pci/echoaudio/midi.c                         |  2 +-
 sound/pci/korg1212/korg1212.c                      |  4 +-
 sound/pci/rme9652/hdsp.c                           |  4 +-
 sound/pci/rme9652/hdspm.c                          |  4 +-
 sound/sh/aica.c                                    |  6 +--
 sound/soc/codecs/rt5645.c                          |  2 +-
 sound/soc/fsl/imx-pcm-rpmsg.c                      |  2 +-
 sound/soc/ti/ams-delta.c                           |  2 +-
 sound/synth/emux/emux_synth.c                      |  4 +-
 sound/usb/midi.c                                   |  4 +-
 731 files changed, 1506 insertions(+), 1506 deletions(-)
Documentation/RCU/Design/Requirements/Requirements.rst +1 -1
index 6125e7068d2c..0f96e8ad02b6 100644
@@ -1857,7 +1857,7 @@ The Linux kernel has loadable modules, and these modules can also be
 unloaded. After a given module has been unloaded, any attempt to call
 one of its functions results in a segmentation fault. The module-unload
 functions must therefore cancel any delayed calls to loadable-module
-functions, for example, any outstanding mod_timer() must be dealt
+functions, for example, any outstanding timer_mod() must be dealt
 with via timer_shutdown_sync() or similar.
 
 Unfortunately, there is no way to cancel an RCU callback; once you
Documentation/RCU/rcu_dereference.rst +1 -1
index 2524dcdadde2..83d716b00236 100644
@@ -171,7 +171,7 @@ readers working properly:
 		-	During some prior acquisition of the lock that
 			we now hold.
 
-		-	Before mod_timer() time for a timer handler.
+		-	Before timer_mod() time for a timer handler.
 
 		There are many other possibilities involving the Linux
 		kernel's wide array of primitives that cause code to
Documentation/core-api/local_ops.rst +2 -2
index 0b42ceaaf3c4..1d7792648f47 100644
@@ -177,14 +177,14 @@ Here is a sample module which implements a basic per cpu counter using
                     printk("Read : CPU %d, count %ld\n", cpu,
                             local_read(&per_cpu(counters, cpu)));
             }
-            mod_timer(&test_timer, jiffies + 1000);
+            timer_mod(&test_timer, jiffies + 1000);
     }
 
     static int __init test_init(void)
     {
             /* initialize the timer that will increment the counter */
             timer_setup(&test_timer, do_test_timer, 0);
-            mod_timer(&test_timer, jiffies + 1);
+            timer_mod(&test_timer, jiffies + 1);
 
             return 0;
     }
Documentation/scsi/ChangeLog.lpfc +3 -3
index 801895f3a284..e0d5f5258900 100644
@@ -104,7 +104,7 @@ Changes from 20050215 to 20050223
 	  equivalents instead of dma_set_mask and also modify condition
 	  clause to actually exit on error condition.
 	* Restart els timeout handler only if txcmplq_cnt. On submission,
-	  mod_timer the els_tmofunc.  This prevents the worker thread from
+	  timer_mod the els_tmofunc.  This prevents the worker thread from
 	  waking up the els_tmo handler un-necessarily.  The thread was
 	  being woken up even when there were no pending els commands.
 	* Added new typedefs for abort and reset functions.
@@ -796,7 +796,7 @@ Changes from 20040908 to 20040920
 	* Remove unnecessary lpfc_brd_no.  Ensure brd_no assignment is
 	  unique.
 	* Removed unused MAX_FCP_LUN.
-	* Use mod_timer instead of timer_add for fdmi in lpfc_ct.c.
+	* Use timer_mod instead of timer_add for fdmi in lpfc_ct.c.
 	* Fixed misc discovery problems.
 	* Move stopping timers till just before lpfc_mem_free() call.
 	* Fix up NameServer reglogin error path.
@@ -888,7 +888,7 @@ Changes from 20040810 to 20040823
 
 	* Changed version number to 8.0.10
 	* Additional timer changes as per Arjan / Christoph's comments.
-	* Used mod_timer() instead of del_timer_sync() where appropriate.
+	* Used timer_mod() instead of del_timer_sync() where appropriate.
 	* Fixed a use after free case (panic on 2.6.8.1 with
 	  CONFIG_DEBUG_SLAB set).
 	* Fix compile warning in lpfc_fcp.c.
Documentation/translations/zh_CN/core-api/local_ops.rst +2 -2
index eb5423f60f17..f8e91b5970d3 100644
@@ -171,14 +171,14 @@ UP之间没有不同的行为,在你的架构的 ``local.h`` 中包括 ``asm-g
                     printk("Read : CPU %d, count %ld\n", cpu,
                             local_read(&per_cpu(counters, cpu)));
             }
-            mod_timer(&test_timer, jiffies + 1000);
+            timer_mod(&test_timer, jiffies + 1000);
     }
 
     static int __init test_init(void)
     {
             /* initialize the timer that will increment the counter */
             timer_setup(&test_timer, do_test_timer, 0);
-            mod_timer(&test_timer, jiffies + 1);
+            timer_mod(&test_timer, jiffies + 1);
 
             return 0;
     }
arch/alpha/kernel/srmcons.c +2 -2
index 3ea472b698cd..f28bb2d7943a 100644
@@ -83,7 +83,7 @@ srmcons_receive_chars(struct timer_list *t)
 
 	spin_lock(&port->lock);
 	if (port->tty)
-		mod_timer(&srmconsp->timer, jiffies + incr);
+		timer_mod(&srmconsp->timer, jiffies + incr);
 	spin_unlock(&port->lock);
 
 	local_irq_restore(flags);
@@ -158,7 +158,7 @@ srmcons_open(struct tty_struct *tty, struct file *filp)
 		tty->driver_data = srmconsp;
 		tty->port = port;
 		port->tty = tty; /* XXX proper refcounting */
-		mod_timer(&srmconsp->timer, jiffies + 10);
+		timer_mod(&srmconsp->timer, jiffies + 10);
 	}
 
 	spin_unlock_irqrestore(&port->lock, flags);
arch/arm/mach-pxa/sharpsl_pm.c +3 -3
index 71b282b146d0..dce6ef6b69df 100644
@@ -351,7 +351,7 @@ static irqreturn_t sharpsl_ac_isr(int irq, void *dev_id)
 {
 	/* Delay the event slightly to debounce */
 	/* Must be a smaller delay than the chrg_full_isr below */
-	mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
+	timer_mod(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
 
 	return IRQ_HANDLED;
 }
@@ -388,7 +388,7 @@ static irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id)
 		return IRQ_HANDLED;
 
 	/* delay until after any ac interrupt */
-	mod_timer(&sharpsl_pm.chrg_full_timer, jiffies + msecs_to_jiffies(500));
+	timer_mod(&sharpsl_pm.chrg_full_timer, jiffies + msecs_to_jiffies(500));
 
 	return IRQ_HANDLED;
 }
@@ -883,7 +883,7 @@ static int sharpsl_pm_probe(struct platform_device *pdev)
 	suspend_set_ops(&sharpsl_pm_ops);
 #endif
 
-	mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
+	timer_mod(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
 
 	return 0;
 }
arch/mips/sgi-ip22/ip22-reset.c +1 -1
index 32b0f9f1d877..bd9e0f077f42 100644
@@ -93,7 +93,7 @@ static void blink_timeout(struct timer_list *unused)
 	sgi_ioc_reset ^= (SGIOC_RESET_LC0OFF|SGIOC_RESET_LC1OFF);
 	sgioc->reset = sgi_ioc_reset;
 
-	mod_timer(&blink_timer, jiffies + blink_timer_timeout);
+	timer_mod(&blink_timer, jiffies + blink_timer_timeout);
 }
 
 static void debounce(struct timer_list *unused)
arch/mips/sgi-ip32/ip32-reset.c +1 -1
index ef778499ebd3..fd611a85fdb7 100644
@@ -79,7 +79,7 @@ static void blink_timeout(struct timer_list *unused)
 {
 	unsigned long led = mace->perif.ctrl.misc ^ MACEISA_LED_RED;
 	mace->perif.ctrl.misc = led;
-	mod_timer(&blink_timer, jiffies + blink_timer_timeout);
+	timer_mod(&blink_timer, jiffies + blink_timer_timeout);
 }
 
 static void ip32_machine_halt(void)
arch/powerpc/kvm/booke.c +1 -1
index e56f78b4760a..5322a9dea19d 100644
@@ -620,7 +620,7 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu)
 	 * then do not run the watchdog timer as this can break timer APIs.
 	 */
 	if (nr_jiffies < NEXT_TIMER_MAX_DELTA)
-		mod_timer(&vcpu->arch.wdt_timer, jiffies + nr_jiffies);
+		timer_mod(&vcpu->arch.wdt_timer, jiffies + nr_jiffies);
 	else
 		timer_delete(&vcpu->arch.wdt_timer);
 	spin_unlock_irqrestore(&vcpu->arch.wdt_lock, flags);
arch/powerpc/platforms/cell/spufs/sched.c +4 -4
index 8e7ed010bfde..9e3232f1e9c1 100644
@@ -491,7 +491,7 @@ static void __spu_add_to_rq(struct spu_context *ctx)
 		list_add_tail(&ctx->rq, &spu_prio->runq[ctx->prio]);
 		set_bit(ctx->prio, spu_prio->bitmap);
 		if (!spu_prio->nr_waiting++)
-			mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
+			timer_mod(&spusched_timer, jiffies + SPUSCHED_TICK);
 	}
 }
 
@@ -975,13 +975,13 @@ static void spu_calc_load(void)
 
 static void spusched_wake(struct timer_list *unused)
 {
-	mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
+	timer_mod(&spusched_timer, jiffies + SPUSCHED_TICK);
 	wake_up_process(spusched_task);
 }
 
 static void spuloadavg_wake(struct timer_list *unused)
 {
-	mod_timer(&spuloadavg_timer, jiffies + LOAD_FREQ);
+	timer_mod(&spuloadavg_timer, jiffies + LOAD_FREQ);
 	spu_calc_load();
 }
 
@@ -1101,7 +1101,7 @@ int __init spu_sched_init(void)
 		goto out_free_spu_prio;
 	}
 
-	mod_timer(&spuloadavg_timer, 0);
+	timer_mod(&spuloadavg_timer, 0);
 
 	entry = proc_create_single("spu_loadavg", 0, NULL, show_spu_loadavg);
 	if (!entry)
arch/s390/kernel/lgr.c +1 -1
index 6d1ffca5f798..3a26005c306f 100644
@@ -166,7 +166,7 @@ static struct timer_list lgr_timer;
  */
 static void lgr_timer_set(void)
 {
-	mod_timer(&lgr_timer, jiffies + secs_to_jiffies(LGR_TIMER_INTERVAL_SECS));
+	timer_mod(&lgr_timer, jiffies + secs_to_jiffies(LGR_TIMER_INTERVAL_SECS));
 }
 
 /*
arch/s390/kernel/time.c +3 -3
index fed17d407a44..945024a20b8b 100644
@@ -657,12 +657,12 @@ static void stp_check_leap(void)
 		if (ret < 0)
 			pr_err("failed to set leap second flags\n");
 		/* arm Timer to clear leap second flags */
-		mod_timer(&stp_timer, jiffies + secs_to_jiffies(14400));
+		timer_mod(&stp_timer, jiffies + secs_to_jiffies(14400));
 	} else {
 		/* The day the leap second is scheduled for hasn't been reached. Retry
 		 * in one hour.
 		 */
-		mod_timer(&stp_timer, jiffies + secs_to_jiffies(3600));
+		timer_mod(&stp_timer, jiffies + secs_to_jiffies(3600));
 	}
 }
 
@@ -706,7 +706,7 @@ static void stp_work_fn(struct work_struct *work)
 		 * There is a usable clock but the synchronization failed.
 		 * Retry after a second.
 		 */
-		mod_timer(&stp_timer, jiffies + msecs_to_jiffies(MSEC_PER_SEC));
+		timer_mod(&stp_timer, jiffies + msecs_to_jiffies(MSEC_PER_SEC));
 	else if (stp_info.lu)
 		stp_check_leap();
 
arch/s390/kernel/topology.c +2 -2
index 3df048e190b1..8d78092d599e 100644
@@ -370,9 +370,9 @@ static atomic_t topology_poll = ATOMIC_INIT(0);
 static void set_topology_timer(void)
 {
 	if (atomic_add_unless(&topology_poll, -1, 0))
-		mod_timer(&topology_timer, jiffies + msecs_to_jiffies(100));
+		timer_mod(&topology_timer, jiffies + msecs_to_jiffies(100));
 	else
-		mod_timer(&topology_timer, jiffies + secs_to_jiffies(60));
+		timer_mod(&topology_timer, jiffies + secs_to_jiffies(60));
 }
 
 void topology_expect_change(void)
arch/s390/lib/test_unwind.c +1 -1
index 6e42100875e7..5d0fe922d787 100644
@@ -391,7 +391,7 @@ static int test_unwind_irq(struct unwindme *u)
 	unwindme = u;
 	init_completion(&u->task_ready);
 	timer_setup(&unwind_timer, unwindme_timer_fn, 0);
-	mod_timer(&unwind_timer, jiffies + 1);
+	timer_mod(&unwind_timer, jiffies + 1);
 	wait_for_completion(&u->task_ready);
 	return u->ret;
 }
arch/s390/mm/cmm.c +1 -1
index e2a6eb92420f..139ca17dfb77 100644
@@ -204,7 +204,7 @@ static void cmm_set_timer(void)
 			timer_delete(&cmm_timer);
 		return;
 	}
-	mod_timer(&cmm_timer, jiffies + secs_to_jiffies(cmm_timeout_seconds));
+	timer_mod(&cmm_timer, jiffies + secs_to_jiffies(cmm_timeout_seconds));
 }
 
 static void cmm_timer_fn(struct timer_list *unused)
arch/sh/boards/mach-highlander/psw.c +1 -1
index d445c54f74e4..754b157360ff 100644
@@ -34,7 +34,7 @@ static irqreturn_t psw_irq_handler(int irq, void *arg)
 	if (mask & (1 << psw_info->bit)) {
 		psw->state = !!(mask & (1 << psw_info->bit));
 		if (psw->state)	/* debounce */
-			mod_timer(&psw->debounce, jiffies + 50);
+			timer_mod(&psw->debounce, jiffies + 50);
 
 		ret = 1;
 	}
arch/sh/boards/mach-landisk/psw.c +1 -1
index e171d9af48f3..61e87aadd08f 100644
@@ -33,7 +33,7 @@ static irqreturn_t psw_irq_handler(int irq, void *arg)
 	/* Figure out who raised it */
 	if (sw_value & (1 << psw_info->bit)) {
 		psw->state = 1;
-		mod_timer(&psw->debounce, jiffies + 50);
+		timer_mod(&psw->debounce, jiffies + 50);
 		ret = 1;
 	}
 
arch/sh/drivers/heartbeat.c +2 -2
index 42103038a7d0..aab03af72c5a 100644
@@ -67,7 +67,7 @@ static void heartbeat_timer(struct timer_list *t)
 	if ((bit == 0) || (bit == (hd->nr_bits)-1))
 		up = -up;
 
-	mod_timer(&hd->timer, jiffies + (110 - ((300 << FSHIFT) /
+	timer_mod(&hd->timer, jiffies + (110 - ((300 << FSHIFT) /
 			((avenrun[0] / 5) + (3 << FSHIFT)))));
 }
 
@@ -133,7 +133,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
 	timer_setup(&hd->timer, heartbeat_timer, 0);
 	platform_set_drvdata(pdev, hd);
 
-	return mod_timer(&hd->timer, jiffies + 1);
+	return timer_mod(&hd->timer, jiffies + 1);
 }
 
 static struct platform_driver heartbeat_driver = {
arch/sparc/kernel/viohs.c +1 -1
index 8fb2e7ca5015..3db3f1f077f2 100644
@@ -795,7 +795,7 @@ void vio_port_up(struct vio_driver_state *vio)
 		unsigned long expires = jiffies + HZ;
 
 		expires = round_jiffies(expires);
-		mod_timer(&vio->timer, expires);
+		timer_mod(&vio->timer, expires);
 	}
 
 	spin_unlock_irqrestore(&vio->lock, flags);
arch/um/drivers/vector_kern.c +1 -1
index abaf9fdb8ab2..d8f36422bddc 100644
@@ -1063,7 +1063,7 @@ static int vector_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	queue_depth = vector_enqueue(vp->tx_queue, skb);
 
 	if (queue_depth < vp->tx_queue->max_depth && netdev_xmit_more()) {
-		mod_timer(&vp->tl, vp->coalesce);
+		timer_mod(&vp->tl, vp->coalesce);
 		return NETDEV_TX_OK;
 	} else {
 		queue_depth = vector_send(vp->tx_queue);
arch/x86/kernel/apic/vector.c +1 -1
index ad8b79b0d0d9..7d8dce0cb486 100644
@@ -1070,7 +1070,7 @@ static void __vector_cleanup(struct vector_cleanup *cl, bool check_irr)
 	 * in __vector_schedule_cleanup() race free against the rearm here.
 	 */
 	if (rearm)
-		mod_timer(&cl->timer, jiffies + 1);
+		timer_mod(&cl->timer, jiffies + 1);
 }
 
 static void vector_cleanup_callback(struct timer_list *tmr)
arch/x86/kernel/cpu/mce/core.c +1 -1
index f6fd71b64b66..16b4aaccf1bc 100644
@@ -1728,7 +1728,7 @@ static void __start_timer(struct timer_list *t, unsigned long interval)
 	local_irq_save(flags);
 
 	if (!timer_pending(t) || time_before(when, t->expires))
-		mod_timer(t, round_jiffies(when));
+		timer_mod(t, round_jiffies(when));
 
 	local_irq_restore(flags);
 }
arch/x86/kvm/xen.c +1 -1
index a1c9559944a3..e539fc93e657 100644
@@ -1547,7 +1547,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode,
 		kvm_set_mp_state(vcpu, KVM_MP_STATE_HALTED);
 
 		if (sched_poll.timeout)
-			mod_timer(&vcpu->arch.xen.poll_timer,
+			timer_mod(&vcpu->arch.xen.poll_timer,
 				  jiffies + nsecs_to_jiffies(sched_poll.timeout));
 
 		kvm_vcpu_halt(vcpu);
arch/xtensa/platforms/iss/console.c +2 -2
index 8b95221375a8..3dcbe6261049 100644
@@ -40,7 +40,7 @@ static DEFINE_TIMER(serial_timer, rs_poll);
 static int rs_open(struct tty_struct *tty, struct file * filp)
 {
 	if (tty->count == 1)
-		mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
+		timer_mod(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
 
 	return 0;
 }
@@ -78,7 +78,7 @@ static void rs_poll(struct timer_list *unused)
 	if (i)
 		tty_flip_buffer_push(port);
 	if (rd)
-		mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
+		timer_mod(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
 }
 
 static unsigned int rs_write_room(struct tty_struct *tty)
arch/xtensa/platforms/iss/network.c +2 -2
index f0a63b2f85cc..1f41e5423c55 100644
@@ -341,7 +341,7 @@ static void iss_net_timer(struct timer_list *t)
 	struct iss_net_private *lp = timer_container_of(lp, t, timer);
 
 	iss_net_poll(lp);
-	mod_timer(&lp->timer, jiffies + lp->timer_val);
+	timer_mod(&lp->timer, jiffies + lp->timer_val);
 }
 
 
@@ -365,7 +365,7 @@ static int iss_net_open(struct net_device *dev)
 
 	timer_setup(&lp->timer, iss_net_timer, 0);
 	lp->timer_val = ISS_NET_TIMER_VALUE;
-	mod_timer(&lp->timer, jiffies + lp->timer_val);
+	timer_mod(&lp->timer, jiffies + lp->timer_val);
 
 	return err;
 }
arch/xtensa/platforms/xt2000/setup.c +2 -2
index 258e01a51fd8..6e88aeed95d4 100644
@@ -81,7 +81,7 @@ static void xt2000_heartbeat(struct timer_list *unused)
 
 	led_print(7, i ? "." : " ");
 	i ^= 1;
-	mod_timer(&heartbeat_timer, jiffies + HZ / 2);
+	timer_mod(&heartbeat_timer, jiffies + HZ / 2);
 }
 
 //#define RS_TABLE_SIZE 2
@@ -139,7 +139,7 @@ static int __init xt2000_setup_devinit(void)
 {
 	platform_device_register(&xt2000_serial8250_device);
 	platform_device_register(&xt2000_sonic_device);
-	mod_timer(&heartbeat_timer, jiffies + HZ / 2);
+	timer_mod(&heartbeat_timer, jiffies + HZ / 2);
 	register_restart_handler(&xt2000_restart_block);
 	register_sys_off_handler(SYS_OFF_MODE_POWER_OFF,
 				 SYS_OFF_PRIO_DEFAULT,
block/blk-iolatency.c +1 -1
index 61d183028a5c..937d3f583dfe 100644
@@ -482,7 +482,7 @@ static void blkcg_iolatency_throttle(struct rq_qos *rqos, struct bio *bio)
 		blkg = blkg->parent;
 	}
 	if (!timer_pending(&blkiolat->timer))
-		mod_timer(&blkiolat->timer, jiffies + HZ);
+		timer_mod(&blkiolat->timer, jiffies + HZ);
 }
 
 static void iolatency_record_time(struct iolatency_grp *iolat,
block/blk-mq.c +1 -1
index c2697db59109..ce8cf7ada492 100644
@@ -1740,7 +1740,7 @@ static void blk_mq_timeout_work(struct work_struct *work)
 	}
 
 	if (expired.next != 0) {
-		mod_timer(&q->timeout, expired.next);
+		timer_mod(&q->timeout, expired.next);
 	} else {
 		/*
 		 * Request timeouts are handled as a forward rolling timer. If
block/blk-stat.h +2 -2
index 9e05bf18d1be..e0660c4e0d31 100644
@@ -143,7 +143,7 @@ static inline bool blk_stat_is_active(struct blk_stat_callback *cb)
 static inline void blk_stat_activate_nsecs(struct blk_stat_callback *cb,
 					   u64 nsecs)
 {
-	mod_timer(&cb->timer, jiffies + nsecs_to_jiffies(nsecs));
+	timer_mod(&cb->timer, jiffies + nsecs_to_jiffies(nsecs));
 }
 
 static inline void blk_stat_deactivate(struct blk_stat_callback *cb)
@@ -162,7 +162,7 @@ static inline void blk_stat_deactivate(struct blk_stat_callback *cb)
 static inline void blk_stat_activate_msecs(struct blk_stat_callback *cb,
 					   unsigned int msecs)
 {
-	mod_timer(&cb->timer, jiffies + msecs_to_jiffies(msecs));
+	timer_mod(&cb->timer, jiffies + msecs_to_jiffies(msecs));
 }
 
 void blk_rq_stat_add(struct blk_rq_stat *, u64);
block/blk-throttle.c +1 -1
index 13c5943b535e..f81897f3c6c5 100644
@@ -431,7 +431,7 @@ static void throtl_schedule_pending_timer(struct throtl_service_queue *sq,
 	 */
 	if (time_after(expires, max_expire))
 		expires = max_expire;
-	mod_timer(&sq->pending_timer, expires);
+	timer_mod(&sq->pending_timer, expires);
 	throtl_log(sq, "schedule timer. delay=%lu jiffies=%lu",
 		   expires - jiffies, jiffies);
 }
block/blk-timeout.c +1 -1
index 1b8de0417fc1..da9084faaad0 100644
@@ -161,7 +161,7 @@ void blk_add_timer(struct request *req)
 		 * will be X + something.
 		 */
 		if (!timer_pending(&q->timeout) || (diff >= HZ / 2))
-			mod_timer(&q->timeout, expiry);
+			timer_mod(&q->timeout, expiry);
 	}
 
 }
drivers/accel/qaic/qaic_timesync.c +4 -4
index 1b59c51ea44a..b65917e52b9b 100644
@@ -140,7 +140,7 @@ static void qaic_timesync_timer(struct timer_list *t)
 
 	if (atomic_read(&mqtsdev->buff_in_use)) {
 		dev_dbg(mqtsdev->dev, "%s buffer not free, schedule next cycle\n", __func__);
-		goto mod_timer;
+		goto timer_mod;
 	}
 	atomic_set(&mqtsdev->buff_in_use, 1);
 
@@ -165,10 +165,10 @@ static void qaic_timesync_timer(struct timer_list *t)
 		atomic_set(&mqtsdev->buff_in_use, 0);
 	}
 
-mod_timer:
-	ret = mod_timer(t, jiffies + msecs_to_jiffies(timesync_delay_ms));
+timer_mod:
+	ret = timer_mod(t, jiffies + msecs_to_jiffies(timesync_delay_ms));
 	if (ret)
-		dev_err(mqtsdev->dev, "%s mod_timer error:%d\n", __func__, ret);
+		dev_err(mqtsdev->dev, "%s timer_mod error:%d\n", __func__, ret);
 }
 
 static int qaic_timesync_probe(struct mhi_device *mhi_dev, const struct mhi_device_id *id)
drivers/accessibility/speakup/main.c +2 -2
index e68cf1d83787..7d9049777958 100644
@@ -1441,7 +1441,7 @@ static void start_read_all_timer(struct vc_data *vc, enum read_all_command comma
 	cursor_con = vc->vc_num;
 	read_all_key = command;
 	cursor_timeout = spk_get_var(CURSOR_TIME);
-	mod_timer(&cursor_timer,
+	timer_mod(&cursor_timer,
 		  jiffies + msecs_to_jiffies(cursor_timeout->u.n.value));
 }
 
@@ -1565,7 +1565,7 @@ static void do_handle_cursor(struct vc_data *vc, u_char value, char up_flag)
 	if (cursor_track == CT_Highlight)
 		reset_highlight_buffers(vc);
 	cursor_timeout = spk_get_var(CURSOR_TIME);
-	mod_timer(&cursor_timer,
+	timer_mod(&cursor_timer,
 		  jiffies + msecs_to_jiffies(cursor_timeout->u.n.value));
 	spin_unlock_irqrestore(&speakup_info.spinlock, flags);
 }
drivers/accessibility/speakup/synth.c +1 -1
index d8addbf3ad0d..1a47c8cd0a4b 100644
@@ -187,7 +187,7 @@ void synth_start(void)
 	}
 	trigger_time = spk_get_var(TRIGGER);
 	if (!timer_pending(&thread_timer))
-		mod_timer(&thread_timer, jiffies +
+		timer_mod(&thread_timer, jiffies +
 			msecs_to_jiffies(trigger_time->u.n.value));
 }
 
drivers/ata/libahci.c +2 -2
index 4e9c82f36df1..f4719eae4db2 100644
@@ -1029,7 +1029,7 @@ static void ahci_sw_activity(struct ata_link *link)
 
 	emp->activity++;
 	if (!timer_pending(&emp->timer))
-		mod_timer(&emp->timer, jiffies + msecs_to_jiffies(10));
+		timer_mod(&emp->timer, jiffies + msecs_to_jiffies(10));
 }
 
 static void ahci_sw_activity_blink(struct timer_list *t)
@@ -1065,7 +1065,7 @@ static void ahci_sw_activity_blink(struct timer_list *t)
 
 		/* toggle state */
 		led_message |= (activity_led_state << 16);
-		mod_timer(&emp->timer, jiffies + msecs_to_jiffies(100));
+		timer_mod(&emp->timer, jiffies + msecs_to_jiffies(100));
 	} else {
 		/* switch to idle */
 		led_message &= ~EM_MSG_LED_VALUE_ACTIVITY;
drivers/atm/idt77105.c +2 -2
index 2dd628debe11..fe5b7f7fd16e 100644
@@ -97,7 +97,7 @@ static void idt77105_stats_timer_func(struct timer_list *unused)
                 stats->rx_cells += get_counter(dev, IDT77105_CTRSEL_RCC);
                 stats->rx_hec_errors += get_counter(dev, IDT77105_CTRSEL_RHEC);
 	}
-        if (!start_timer) mod_timer(&stats_timer,jiffies+IDT77105_STATS_TIMER_PERIOD);
+        if (!start_timer) timer_mod(&stats_timer,jiffies+IDT77105_STATS_TIMER_PERIOD);
 }
 
 
@@ -135,7 +135,7 @@ static void idt77105_restart_timer_func(struct timer_list *unused)
 	            PUT( walk->old_mcr ,MCR);
                 }
 	}
-        if (!start_timer) mod_timer(&restart_timer,jiffies+IDT77105_RESTART_TIMER_PERIOD);
+        if (!start_timer) timer_mod(&restart_timer,jiffies+IDT77105_RESTART_TIMER_PERIOD);
 }
 
 
drivers/atm/idt77252.c +6 -6
index c7c0cd9ca86a..8fb7071e8a56 100644
@@ -1547,7 +1547,7 @@ tst_timer(struct timer_list *t)
 
 		pc = readl(SAR_REG_NOW) >> 2;
 		if ((pc ^ idle) & ~(card->tst_size - 1)) {
-			mod_timer(&card->tst_timer, jiffies + 1);
+			timer_mod(&card->tst_timer, jiffies + 1);
 			goto out;
 		}
 
@@ -1584,7 +1584,7 @@ tst_timer(struct timer_list *t)
 		write_sram(card, jump, TSTE_OPC_NULL);
 		set_bit(TST_SWITCH_WAIT, &card->tst_state);
 
-		mod_timer(&card->tst_timer, jiffies + 1);
+		timer_mod(&card->tst_timer, jiffies + 1);
 	}
 
 out:
@@ -1663,7 +1663,7 @@ fill_tst(struct idt77252_dev *card, struct vc_map *vc, int n, unsigned int opc)
 
 	set_bit(TST_SWITCH_PENDING, &card->tst_state);
 	if (!timer_pending(&card->tst_timer))
-		mod_timer(&card->tst_timer, jiffies + 1);
+		timer_mod(&card->tst_timer, jiffies + 1);
 
 	spin_unlock_irqrestore(&card->tst_lock, flags);
 	return res;
@@ -1706,7 +1706,7 @@ clear_tst(struct idt77252_dev *card, struct vc_map *vc)
 
 	set_bit(TST_SWITCH_PENDING, &card->tst_state);
 	if (!timer_pending(&card->tst_timer))
-		mod_timer(&card->tst_timer, jiffies + 1);
+		timer_mod(&card->tst_timer, jiffies + 1);
 
 	spin_unlock_irqrestore(&card->tst_lock, flags);
 	return res;
@@ -1726,7 +1726,7 @@ change_tst(struct idt77252_dev *card, struct vc_map *vc,
 
 	set_bit(TST_SWITCH_PENDING, &card->tst_state);
 	if (!timer_pending(&card->tst_timer))
-		mod_timer(&card->tst_timer, jiffies + 1);
+		timer_mod(&card->tst_timer, jiffies + 1);
 
 	spin_unlock_irqrestore(&card->tst_lock, flags);
 	return res;
@@ -2124,7 +2124,7 @@ idt77252_init_est(struct vc_map *vc, int pcr)
 	est->interval = 2;		/* XXX: make this configurable */
 	est->ewma_log = 2;		/* XXX: make this configurable */
 	timer_setup(&est->timer, idt77252_est_timer, 0);
-	mod_timer(&est->timer, jiffies + ((HZ / 4) << est->interval));
+	timer_mod(&est->timer, jiffies + ((HZ / 4) << est->interval));
 
 	return est;
 }
drivers/atm/iphase.c +1 -1
index 246ec28aca4f..9cd4c7841254 100644
@@ -2463,7 +2463,7 @@ static void ia_led_timer(struct timer_list *unused) {
               }
            }
         }
-	mod_timer(&ia_timer, jiffies + HZ / 4);
+	timer_mod(&ia_timer, jiffies + HZ / 4);
  	return;
 }
 
drivers/atm/lanai.c +1 -1
index d8ac6fade09a..17ace42e7c4e 100644
@@ -1780,7 +1780,7 @@ static void lanai_timed_poll(struct timer_list *t)
 
 	get_statistics(lanai);
 #endif /* !DEBUG_RW */
-	mod_timer(&lanai->timer, jiffies + LANAI_POLL_PERIOD);
+	timer_mod(&lanai->timer, jiffies + LANAI_POLL_PERIOD);
 }
 
 static inline void lanai_timed_poll_start(struct lanai_dev *lanai)
drivers/atm/nicstar.c +1 -1
index 028bb868180b..303c9c83c52a 100644
@@ -2719,7 +2719,7 @@ static void ns_poll(struct timer_list *unused)
 		writel(stat_w, card->membase + STAT);
 		spin_unlock_irqrestore(&card->int_lock, flags);
 	}
-	mod_timer(&ns_timer, jiffies + NS_POLL_PERIOD);
+	timer_mod(&ns_timer, jiffies + NS_POLL_PERIOD);
 	PRINTK("nicstar: Leaving ns_poll().\n");
 }
 
drivers/atm/suni.c +1 -1
index 899bab8b3c43..8996e764696e 100644
@@ -85,7 +85,7 @@ static void suni_hz(struct timer_list *timer)
 		    ((GET(TACP_TCC) & 0xff) << 8) |
 		    ((GET(TACP_TCCM) & 7) << 16));
 	}
-	if (timer) mod_timer(&poll_timer,jiffies+HZ);
+	if (timer) timer_mod(&poll_timer,jiffies+HZ);
 }
 
 
drivers/auxdisplay/line-display.c +1 -1
index 8590a4cd21e0..dde3678400d8 100644
@@ -63,7 +63,7 @@ static void linedisp_scroll(struct timer_list *t)
 
 	/* rearm the timer */
 	if (linedisp->message_len > num_chars && linedisp->scroll_rate)
-		mod_timer(&linedisp->timer, jiffies + linedisp->scroll_rate);
+		timer_mod(&linedisp->timer, jiffies + linedisp->scroll_rate);
 }
 
 /**
drivers/auxdisplay/panel.c +1 -1
index ccfd0b06ed6c..5a60d010890c 100644
@@ -1350,7 +1350,7 @@ static void panel_scan_timer(struct timer_list *unused)
 	if (keypressed && lcd.enabled && lcd.initialized)
 		charlcd_poke(lcd.charlcd);
 
-	mod_timer(&scan_timer, jiffies + INPUT_POLL_TIME);
+	timer_mod(&scan_timer, jiffies + INPUT_POLL_TIME);
 }
 
 static void init_scan_timer(void)
drivers/base/power/main.c +1 -1
index c47b246dbf87..5d840dce3a23 100644
@@ -529,7 +529,7 @@ static void dpm_watchdog_handler(struct timer_list *t)
 	show_stack(wd->tsk, NULL, KERN_WARNING);
 
 	wd->fatal = true;
-	mod_timer(timer, jiffies + HZ * time_left);
+	timer_mod(timer, jiffies + HZ * time_left);
 }
 
 /**
drivers/base/power/wakeup.c +1 -1
index e6306e1996eb..3ab1299c7a20 100644
@@ -812,7 +812,7 @@ void pm_wakeup_ws_event(struct wakeup_source *ws, unsigned int msec, bool hard)
 		expires = 1;
 
 	if (!ws->timer_expires || time_after(expires, ws->timer_expires)) {
-		mod_timer(&ws->timer, expires);
+		timer_mod(&ws->timer, expires);
 		ws->timer_expires = expires;
 	}
 
drivers/block/amiflop.c +3 -3
index 5e7060874912..e9c7c5967b6a 100644
@@ -464,7 +464,7 @@ static int fd_motor_on(int nr)
 		fd_select(nr);
 
 		reinit_completion(&motor_on_completion);
-		mod_timer(&motor_on_timer, jiffies + HZ/2);
+		timer_mod(&motor_on_timer, jiffies + HZ/2);
 
 		on_attempts = 10;
 		wait_for_completion(&motor_on_completion);
@@ -509,7 +509,7 @@ static void floppy_off (unsigned int nr)
 	int drive;
 
 	drive = nr & 3;
-	mod_timer(motor_off_timer + drive, jiffies + 3*HZ);
+	timer_mod(motor_off_timer + drive, jiffies + 3*HZ);
 }
 
 static int fd_calibrate(int drive)
@@ -1495,7 +1495,7 @@ static blk_status_t amiflop_rw_cur_segment(struct amiga_floppy_struct *floppy,
 			 */
 			floppy->dirty = 1;
 		        /* reset the timer */
-			mod_timer (flush_track_timer + drive, jiffies + 1);
+			timer_mod (flush_track_timer + drive, jiffies + 1);
 		}
 	}
 
drivers/block/aoe/aoemain.c +1 -1
index cdf6e4041bb9..8200715d8cee 100644
@@ -20,7 +20,7 @@ struct workqueue_struct *aoe_wq;
 
 static void discover_timer(struct timer_list *t)
 {
-	mod_timer(t, jiffies + HZ * 60); /* one minute */
+	timer_mod(t, jiffies + HZ * 60); /* one minute */
 
 	aoecmd_cfg(0xffff, 0xff);
 }
drivers/block/ataflop.c +7 -7
index 7fe14266c12c..6ceba4113f0d 100644
@@ -478,18 +478,18 @@ static void fd_end_request_cur(blk_status_t err)
 
 static inline void start_motor_off_timer(void)
 {
-	mod_timer(&motor_off_timer, jiffies + FD_MOTOR_OFF_DELAY);
+	timer_mod(&motor_off_timer, jiffies + FD_MOTOR_OFF_DELAY);
 	MotorOffTrys = 0;
 }
 
 static inline void start_check_change_timer( void )
 {
-	mod_timer(&fd_timer, jiffies + CHECK_CHANGE_DELAY);
+	timer_mod(&fd_timer, jiffies + CHECK_CHANGE_DELAY);
 }
 
 static inline void start_timeout(void)
 {
-	mod_timer(&timeout_timer, jiffies + FLOPPY_TIMEOUT);
+	timer_mod(&timeout_timer, jiffies + FLOPPY_TIMEOUT);
 }
 
 static inline void stop_timeout(void)
@@ -598,7 +598,7 @@ static void fd_motor_off_timer(struct timer_list *unused)
 	 * at least until a disk is inserted). So we'll test only twice
 	 * per second from then on...
 	 */
-	mod_timer(&motor_off_timer,
+	timer_mod(&motor_off_timer,
 		  jiffies + (MotorOffTrys++ < FD_MOTOR_OFF_MAXTRY ? HZ/20 : HZ/2));
 }
 
@@ -1067,7 +1067,7 @@ static void fd_rwsec( void )
 		 * recognise that it isn't present :-(
 		 */
 		MultReadInProgress = 1;
-		mod_timer(&readtrack_timer,
+		timer_mod(&readtrack_timer,
 			  /* 1 rot. + 5 rot.s if motor was off  */
 			  jiffies + HZ/5 + (old_motoron ? 0 : HZ));
 	}
@@ -1128,7 +1128,7 @@ static void fd_readtrack_check(struct timer_list *unused)
 		/* not yet finished, wait another tenth rotation */
 		local_irq_restore(flags);
 		DPRINT(("fd_readtrack_check(): not yet finished\n"));
-		mod_timer(&readtrack_timer, jiffies + HZ/5/10);
+		timer_mod(&readtrack_timer, jiffies + HZ/5/10);
 	}
 }
 
@@ -1405,7 +1405,7 @@ static void finish_fdc_done( int dummy )
 		/* If the check for a disk change is done too early after this
 		 * last seek command, the WP bit still reads wrong :-((
 		 */
-		mod_timer(&fd_timer, jiffies + 5);
+		timer_mod(&fd_timer, jiffies + 5);
 	else
 		start_check_change_timer();
 	start_motor_off_timer();
drivers/block/drbd/drbd_main.c +1 -1
index 64f301f1cc63..074b3b6ce719 100644
@@ -3307,7 +3307,7 @@ int drbd_md_read(struct drbd_device *device, struct drbd_backing_dev *bdev)
 void drbd_md_mark_dirty(struct drbd_device *device)
 {
 	if (!test_and_set_bit(MD_DIRTY, &device->flags))
-		mod_timer(&device->md_sync_timer, jiffies + 5*HZ);
+		timer_mod(&device->md_sync_timer, jiffies + 5*HZ);
 }
 
 void drbd_uuid_move_history(struct drbd_device *device) __must_hold(local)
drivers/block/drbd/drbd_nl.c +2 -2
index e09930c2b226..dc66860b4f32 100644
@@ -1610,7 +1610,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
 
 	kvfree_rcu_mightsleep(old_disk_conf);
 	kfree(old_plan);
-	mod_timer(&device->request_timer, jiffies + HZ);
+	timer_mod(&device->request_timer, jiffies + HZ);
 	goto success;
 
 fail_unlock:
@@ -2098,7 +2098,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)
 	if (rv < SS_SUCCESS)
 		goto force_diskless_dec;
 
-	mod_timer(&device->request_timer, jiffies + HZ);
+	timer_mod(&device->request_timer, jiffies + HZ);
 
 	if (device->state.role == R_PRIMARY)
 		device->ldev->md.uuid[UI_CURRENT] |=  (u64)1;
drivers/block/drbd/drbd_receiver.c +1 -1
index fbda55ba253e..b647989ce0cb 100644
@@ -908,7 +908,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
 	clear_bit(USE_DEGR_WFC_T, &device->flags);
 	clear_bit(RESIZE_PENDING, &device->flags);
 	atomic_set(&device->ap_in_flight, 0);
-	mod_timer(&device->request_timer, jiffies + HZ); /* just start it here. */
+	timer_mod(&device->request_timer, jiffies + HZ); /* just start it here. */
 	return err;
 }
 
drivers/block/drbd/drbd_req.c +1 -1
index 915cbb2e4cca..3aab298ef4b5 100644
@@ -1785,5 +1785,5 @@ void request_timer_fn(struct timer_list *t)
 	nt = time_before(ent, dt) ? ent : dt;
 out:
 	spin_unlock_irq(&device->resource->req_lock);
-	mod_timer(&device->request_timer, nt);
+	timer_mod(&device->request_timer, nt);
 }
drivers/block/drbd/drbd_state.c +2 -2
index c2b6c4d9729d..1cb756fc227e 100644
@@ -1375,7 +1375,7 @@ _drbd_set_state(struct drbd_device *device, union drbd_state ns,
 		device->rs_paused += (long)jiffies
 				  -(long)device->rs_mark_time[device->rs_last_mark];
 		if (ns.conn == C_SYNC_TARGET)
-			mod_timer(&device->resync_timer, jiffies);
+			timer_mod(&device->resync_timer, jiffies);
 	}
 
 	if ((os.conn == C_SYNC_TARGET  || os.conn == C_SYNC_SOURCE) &&
@@ -1405,7 +1405,7 @@ _drbd_set_state(struct drbd_device *device, union drbd_state ns,
 		if (ns.conn == C_VERIFY_S) {
 			drbd_info(device, "Starting Online Verify from sector %llu\n",
 					(unsigned long long)device->ov_position);
-			mod_timer(&device->resync_timer, jiffies);
+			timer_mod(&device->resync_timer, jiffies);
 		}
 	}
 
drivers/block/drbd/drbd_worker.c +3 -3
index 1d61328582e2..5b7d81ef58a6 100644
@@ -757,7 +757,7 @@ static int make_resync_request(struct drbd_peer_device *const peer_device, int c
 
  requeue:
 	device->rs_in_flight += (i << (BM_BLOCK_SHIFT - 9));
-	mod_timer(&device->resync_timer, jiffies + SLEEP_TIME);
+	timer_mod(&device->resync_timer, jiffies + SLEEP_TIME);
 	put_ldev(device);
 	return 0;
 }
@@ -811,7 +811,7 @@ static int make_ov_request(struct drbd_peer_device *peer_device, int cancel)
  requeue:
 	device->rs_in_flight += (i << (BM_BLOCK_SHIFT - 9));
 	if (i == 0 || !stop_sector_reached)
-		mod_timer(&device->resync_timer, jiffies + SLEEP_TIME);
+		timer_mod(&device->resync_timer, jiffies + SLEEP_TIME);
 	return 1;
 }
 
@@ -1906,7 +1906,7 @@ void drbd_start_resync(struct drbd_device *device, enum drbd_conns side)
 		 * the timer triggers.
 		 * No matter, that is handled in resync_timer_fn() */
 		if (ns.conn == C_SYNC_TARGET)
-			mod_timer(&device->resync_timer, jiffies);
+			timer_mod(&device->resync_timer, jiffies);
 
 		drbd_md_sync(device);
 	}
drivers/block/sunvdc.c +1 -1
index b5727dea15bd..3c775ddf071a 100644
@@ -1189,7 +1189,7 @@ static void vdc_ldc_reset(struct vdc_port *port)
 	if (port->ldc_timeout)
 		mod_delayed_work(system_wq, &port->ldc_reset_timer_work,
 			  round_jiffies(jiffies + HZ * port->ldc_timeout));
-	mod_timer(&port->vio.timer, round_jiffies(jiffies + HZ));
+	timer_mod(&port->vio.timer, round_jiffies(jiffies + HZ));
 	return;
 
 err_free_ldc:
drivers/bluetooth/bluecard_cs.c +2 -2
index 1e3a56e9b139..50f768920f25 100644
@@ -164,7 +164,7 @@ static void bluecard_activity_led_timeout(struct timer_list *t)
 	if (test_bit(CARD_ACTIVITY, &(info->hw_state))) {
 		/* leave LED in inactive state for HZ/10 for blink effect */
 		clear_bit(CARD_ACTIVITY, &(info->hw_state));
-		mod_timer(&(info->timer), jiffies + HZ / 10);
+		timer_mod(&(info->timer), jiffies + HZ / 10);
 	}
 
 	/* Disable activity LED, enable power LED */
@@ -191,7 +191,7 @@ static void bluecard_enable_activity_led(struct bluecard_info *info)
 	}
 
 	/* Stop the LED after HZ/10 */
-	mod_timer(&(info->timer), jiffies + HZ / 10);
+	timer_mod(&(info->timer), jiffies + HZ / 10);
 }
 
 
drivers/bluetooth/btnxpuart.c +1 -1
index e35ac3e83828..76a1540cdb14 100644
@@ -393,7 +393,7 @@ static void ps_start_timer(struct btnxpuart_dev *nxpdev)
 		return;
 
 	if (psdata->cur_psmode == PS_MODE_ENABLE)
-		mod_timer(&psdata->ps_timer, jiffies + msecs_to_jiffies(psdata->h2c_ps_interval));
+		timer_mod(&psdata->ps_timer, jiffies + msecs_to_jiffies(psdata->h2c_ps_interval));
 
 	if (psdata->ps_state == PS_STATE_AWAKE && psdata->ps_cmd == PS_CMD_ENTER_PS)
 		cancel_work_sync(&psdata->work);
drivers/bluetooth/hci_bcsp.c +1 -1
index 664d82d1e613..1f2fa4efa3ec 100644
@@ -309,7 +309,7 @@ static struct sk_buff *bcsp_dequeue(struct hci_uart *hu)
 						hci_skb_pkt_type(skb));
 			if (nskb) {
 				__skb_queue_tail(&bcsp->unack, skb);
-				mod_timer(&bcsp->tbcsp, jiffies + HZ / 4);
+				timer_mod(&bcsp->tbcsp, jiffies + HZ / 4);
 				spin_unlock_irqrestore(&bcsp->unack.lock, flags);
 				return nskb;
 			} else {
drivers/bluetooth/hci_h5.c +4 -4
index d0d4420c1a0f..7c8123dee962 100644
@@ -165,7 +165,7 @@ static void h5_timed_event(struct timer_list *t)
 	}
 
 	if (h5->state != H5_ACTIVE) {
-		mod_timer(&h5->timer, jiffies + H5_SYNC_TIMEOUT);
+		timer_mod(&h5->timer, jiffies + H5_SYNC_TIMEOUT);
 		goto wakeup;
 	}
 
@@ -245,7 +245,7 @@ static int h5_open(struct hci_uart *hu)
 
 	/* Send initial sync request */
 	h5_link_control(hu, sync, sizeof(sync));
-	mod_timer(&h5->timer, jiffies + H5_SYNC_TIMEOUT);
+	timer_mod(&h5->timer, jiffies + H5_SYNC_TIMEOUT);
 
 	return 0;
 }
@@ -752,7 +752,7 @@ static struct sk_buff *h5_dequeue(struct hci_uart *hu)
 		h5->sleep = H5_WAKING_UP;
 		BT_DBG("Sending wakeup request");
 
-		mod_timer(&h5->timer, jiffies + HZ / 100);
+		timer_mod(&h5->timer, jiffies + HZ / 100);
 		return h5_prepare_pkt(hu, HCI_3WIRE_LINK_PKT, wakeup_req, 2);
 	}
 
@@ -780,7 +780,7 @@ static struct sk_buff *h5_dequeue(struct hci_uart *hu)
 				      skb->data, skb->len);
 		if (nskb) {
 			__skb_queue_tail(&h5->unack, skb);
-			mod_timer(&h5->timer, jiffies + H5_ACK_TIMEOUT);
+			timer_mod(&h5->timer, jiffies + H5_ACK_TIMEOUT);
 			spin_unlock_irqrestore(&h5->unack.lock, flags);
 			return nskb;
 		}
drivers/bluetooth/hci_qca.c +4 -4
index 0a4c84536640..d55756ebbc39 100644
@@ -408,7 +408,7 @@ static void qca_wq_awake_device(struct work_struct *work)
 
 	/* Start retransmit timer */
 	retrans_delay = msecs_to_jiffies(qca->wake_retrans);
-	mod_timer(&qca->wake_retrans_timer, jiffies + retrans_delay);
+	timer_mod(&qca->wake_retrans_timer, jiffies + retrans_delay);
 
 	spin_unlock_irqrestore(&qca->hci_ibs_lock, flags);
 
@@ -534,7 +534,7 @@ static void hci_ibs_wake_retrans_timeout(struct timer_list *t)
 		}
 		qca->ibs_sent_wakes++;
 		retrans_delay = msecs_to_jiffies(qca->wake_retrans);
-		mod_timer(&qca->wake_retrans_timer, jiffies + retrans_delay);
+		timer_mod(&qca->wake_retrans_timer, jiffies + retrans_delay);
 		break;
 
 	case HCI_IBS_TX_ASLEEP:
@@ -869,7 +869,7 @@ static void device_woke_up(struct hci_uart *hu)
 		/* Switch timers and change state to HCI_IBS_TX_AWAKE */
 		timer_delete(&qca->wake_retrans_timer);
 		idle_delay = msecs_to_jiffies(qca->tx_idle_delay);
-		mod_timer(&qca->tx_idle_timer, jiffies + idle_delay);
+		timer_mod(&qca->tx_idle_timer, jiffies + idle_delay);
 		qca->tx_ibs_state = HCI_IBS_TX_AWAKE;
 		break;
 
@@ -926,7 +926,7 @@ static int qca_enqueue(struct hci_uart *hu, struct sk_buff *skb)
 		BT_DBG("Device awake, sending normally");
 		skb_queue_tail(&qca->txq, skb);
 		idle_delay = msecs_to_jiffies(qca->tx_idle_delay);
-		mod_timer(&qca->tx_idle_timer, jiffies + idle_delay);
+		timer_mod(&qca->tx_idle_timer, jiffies + idle_delay);
 		break;
 
 	case HCI_IBS_TX_ASLEEP:
drivers/bus/mhi/host/pci_generic.c +5 -5
index 663c9aa83c21..073411978862 100644
@@ -1123,7 +1123,7 @@ static void mhi_pci_recovery_work(struct work_struct *work)
 	dev_dbg(&pdev->dev, "Recovery completed\n");
 
 	set_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status);
-	mod_timer(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
+	timer_mod(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
 	return;
 
 err_unprepare:
@@ -1150,7 +1150,7 @@ static void health_check(struct timer_list *t)
 	}
 
 	/* reschedule in two seconds */
-	mod_timer(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
+	timer_mod(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
 }
 
 static int mhi_pci_generic_edl_trigger(struct mhi_controller *mhi_cntrl)
@@ -1268,7 +1268,7 @@ static int mhi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	set_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status);
 
 	/* start health check */
-	mod_timer(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
+	timer_mod(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
 
 	/* Only allow runtime-suspend if PME capable (for wakeup) */
 	if (pci_pme_capable(pdev, PCI_D3hot)) {
@@ -1366,7 +1366,7 @@ static void mhi_pci_reset_done(struct pci_dev *pdev)
 	}
 
 	set_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status);
-	mod_timer(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
+	timer_mod(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
 }
 
 static pci_ers_result_t mhi_pci_error_detected(struct pci_dev *pdev,
@@ -1482,7 +1482,7 @@ static int __maybe_unused mhi_pci_runtime_resume(struct device *dev)
 	}
 
 	/* Resume health check */
-	mod_timer(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
+	timer_mod(&mhi_pdev->health_check_timer, jiffies + HEALTH_CHECK_PERIOD);
 
 	/* It can be a remote wakeup (no mhi runtime_get), update access time */
 	pm_runtime_mark_last_busy(dev);
drivers/char/dtlk.c +1 -1
index 16618079298a..29769da8f484 100644
@@ -254,7 +254,7 @@ static __poll_t dtlk_poll(struct file *file, poll_table * wait)
 
 	/* There won't be any interrupts, so we set a timer instead. */
 	expires = jiffies + 3*HZ / 100;
-	mod_timer(&dtlk_timer, expires);
+	timer_mod(&dtlk_timer, expires);
 
 	return mask;
 }
drivers/char/hangcheck-timer.c +2 -2
index 497fc167cb8c..1a0775adb29c 100644
@@ -145,7 +145,7 @@ static void hangcheck_fire(struct timer_list *unused)
 	printk("Hangcheck: called %Ld ns since last time (%Ld ns overshoot)\n",
 			tsc_diff, tsc_diff - hangcheck_tick*TIMER_FREQ);
 #endif
-	mod_timer(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));
+	timer_mod(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));
 	hangcheck_tsc = ktime_get_ns();
 }
 
@@ -159,7 +159,7 @@ static int __init hangcheck_init(void)
 	hangcheck_tsc_margin *= TIMER_FREQ;
 
 	hangcheck_tsc = ktime_get_ns();
-	mod_timer(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));
+	timer_mod(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));
 
 	return 0;
 }
drivers/char/ipmi/ipmi_msghandler.c +3 -3
index 3ba9d7e9a6c7..4d57e56428c2 100644
@@ -5109,14 +5109,14 @@ static void ipmi_timeout(struct timer_list *unused)
 	srcu_read_unlock(&ipmi_interfaces_srcu, index);
 
 	if (need_timer)
-		mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);
+		timer_mod(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);
 }
 
 static void need_waiter(struct ipmi_smi *intf)
 {
 	/* Racy, but worst case we start the timer twice. */
 	if (!timer_pending(&ipmi_timer))
-		mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);
+		timer_mod(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);
 }
 
 static atomic_t smi_msg_inuse_count = ATOMIC_INIT(0);
@@ -5490,7 +5490,7 @@ static int ipmi_init_msghandler(void)
 	}
 
 	timer_setup(&ipmi_timer, ipmi_timeout, 0);
-	mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);
+	timer_mod(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);
 
 	atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
 
drivers/char/ipmi/ipmi_si_intf.c +1 -1
index 548effc12b2b..b05b938f6651 100644
@@ -344,7 +344,7 @@ static void smi_mod_timer(struct smi_info *smi_info, unsigned long new_val)
 	if (!smi_info->timer_can_start)
 		return;
 	smi_info->last_timeout_jiffies = jiffies;
-	mod_timer(&smi_info->si_timer, new_val);
+	timer_mod(&smi_info->si_timer, new_val);
 	smi_info->timer_running = true;
 }
 
drivers/char/ipmi/ipmi_ssif.c +5 -5
index fa726e620e55..615d7d0e1106 100644
@@ -573,7 +573,7 @@ static void watch_timeout(struct timer_list *t)
 
 	flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
 	if (ssif_info->watch_timeout) {
-		mod_timer(&ssif_info->watch_timer,
+		timer_mod(&ssif_info->watch_timer,
 			  jiffies + ssif_info->watch_timeout);
 		if (IS_SSIF_IDLE(ssif_info)) {
 			start_flag_fetch(ssif_info, flags); /* Releases lock */
@@ -628,7 +628,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
 			flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
 			ssif_info->waiting_alert = true;
 			if (!ssif_info->stopping)
-				mod_timer(&ssif_info->retry_timer,
+				timer_mod(&ssif_info->retry_timer,
 					  jiffies + SSIF_MSG_JIFFIES);
 			ipmi_ssif_unlock_cond(ssif_info, flags);
 			return;
@@ -918,7 +918,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
 			 * then redo the send.
 			 */
 			ssif_info->do_resend = true;
-			mod_timer(&ssif_info->retry_timer,
+			timer_mod(&ssif_info->retry_timer,
 				  jiffies + SSIF_REQ_RETRY_JIFFIES);
 			return;
 		}
@@ -984,7 +984,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
 			ssif_info->waiting_alert = true;
 			ssif_info->retries_left = SSIF_RECV_RETRIES;
 			if (!ssif_info->stopping)
-				mod_timer(&ssif_info->retry_timer,
+				timer_mod(&ssif_info->retry_timer,
 					  jiffies + SSIF_MSG_PART_JIFFIES);
 			ipmi_ssif_unlock_cond(ssif_info, flags);
 		}
@@ -1138,7 +1138,7 @@ static void ssif_set_need_watch(void *send_info, unsigned int watch_mask)
 	if (timeout != ssif_info->watch_timeout) {
 		ssif_info->watch_timeout = timeout;
 		if (ssif_info->watch_timeout)
-			mod_timer(&ssif_info->watch_timer,
+			timer_mod(&ssif_info->watch_timer,
 				  jiffies + ssif_info->watch_timeout);
 	}
 	ipmi_ssif_unlock_cond(ssif_info, flags);
drivers/char/ipmi/kcs_bmc_aspeed.c +2 -2
index a13a3470c17a..aa4a3dff4941 100644
@@ -393,7 +393,7 @@ static void aspeed_kcs_check_obe(struct timer_list *timer)
 
 	str = aspeed_kcs_inb(&priv->kcs_bmc, priv->kcs_bmc.ioreg.str);
 	if (str & KCS_BMC_STR_OBF) {
-		mod_timer(timer, jiffies + OBE_POLL_PERIOD);
+		timer_mod(timer, jiffies + OBE_POLL_PERIOD);
 		spin_unlock_irqrestore(&priv->obe.lock, flags);
 		return;
 	}
@@ -426,7 +426,7 @@ static void aspeed_kcs_irq_mask_update(struct kcs_bmc_device *kcs_bmc, u8 mask,
 						      &priv->kcs_bmc, priv->kcs_bmc.ioreg.str);
 			/* Time for the slow path? */
 			if (rc == -ETIMEDOUT)
-				mod_timer(&priv->obe.timer, jiffies + OBE_POLL_PERIOD);
+				timer_mod(&priv->obe.timer, jiffies + OBE_POLL_PERIOD);
 		} else {
 			timer_delete(&priv->obe.timer);
 		}
drivers/char/ipmi/ssif_bmc.c +1 -1
index b7654efcf2c3..77e164339915 100644
@@ -331,7 +331,7 @@ static void handle_request(struct ssif_bmc_ctx *ssif_bmc)
 		timer_setup(&ssif_bmc->response_timer, response_timeout, 0);
 		ssif_bmc->response_timer_inited = true;
 	}
-	mod_timer(&ssif_bmc->response_timer, jiffies + msecs_to_jiffies(RESPONSE_TIMEOUT));
+	timer_mod(&ssif_bmc->response_timer, jiffies + msecs_to_jiffies(RESPONSE_TIMEOUT));
 }
 
 static void calculate_response_part_pec(struct ssif_part_buffer *part)
drivers/char/nwbutton.c +1 -1
index 92cee5717237..1cb585515a6b 100644
@@ -150,7 +150,7 @@ static void button_sequence_finished(struct timer_list *unused)
 static irqreturn_t button_handler (int irq, void *dev_id)
 {
 	button_press_count++;
-	mod_timer(&button_timer, jiffies + bdelay);
+	timer_mod(&button_timer, jiffies + bdelay);
 
 	return IRQ_HANDLED;
 }
drivers/char/tlclk.c +1 -1
index b381ea7e85d2..2782168ec578 100644
@@ -910,7 +910,7 @@ static irqreturn_t tlclk_interrupt(int irq, void *dev_id)
 		/* TIMEOUT in ~10ms */
 		switchover_timer.expires = jiffies + msecs_to_jiffies(10);
 		tlclk_timer_data = inb(TLCLK_REG1);
-		mod_timer(&switchover_timer, switchover_timer.expires);
+		timer_mod(&switchover_timer, switchover_timer.expires);
 	} else {
 		got_event = 1;
 		wake_up(&wq);
drivers/char/tpm/tpm-dev-common.c +2 -2
index f2a5e09257dd..d5d7d7bde5a2 100644
@@ -82,7 +82,7 @@ static void tpm_dev_async_work(struct work_struct *work)
 	 */
 	if (ret != 0) {
 		priv->response_length = ret;
-		mod_timer(&priv->user_read_timer, jiffies + (120 * HZ));
+		timer_mod(&priv->user_read_timer, jiffies + (120 * HZ));
 	}
 out:
 	mutex_unlock(&priv->buffer_mutex);
@@ -231,7 +231,7 @@ ssize_t tpm_common_write(struct file *file, const char __user *buf,
 
 	if (ret > 0) {
 		priv->response_length = ret;
-		mod_timer(&priv->user_read_timer, jiffies + (120 * HZ));
+		timer_mod(&priv->user_read_timer, jiffies + (120 * HZ));
 		ret = size;
 	}
 out:
drivers/comedi/drivers/comedi_test.c +2 -2
index b15cb3d62e26..041279fc3646 100644
@@ -240,7 +240,7 @@ static void waveform_ai_timer(struct timer_list *t)
 			time_increment = 1;
 		spin_lock(&dev->spinlock);
 		if (devpriv->ai_timer_enable) {
-			mod_timer(&devpriv->ai_timer,
+			timer_mod(&devpriv->ai_timer,
 				  jiffies + usecs_to_jiffies(time_increment));
 		}
 		spin_unlock(&dev->spinlock);
@@ -509,7 +509,7 @@ static void waveform_ao_timer(struct timer_list *t)
 
 		spin_lock(&dev->spinlock);
 		if (devpriv->ao_timer_enable) {
-			mod_timer(&devpriv->ao_timer,
+			timer_mod(&devpriv->ao_timer,
 				  jiffies + usecs_to_jiffies(time_inc));
 		}
 		spin_unlock(&dev->spinlock);
drivers/comedi/drivers/das16.c +1 -1
index 5e0866d5d1d6..94b4befcf21c 100644
@@ -525,7 +525,7 @@ static void das16_timer_interrupt(struct timer_list *t)
 
 	spin_lock_irqsave(&dev->spinlock, flags);
 	if (devpriv->timer_running)
-		mod_timer(&devpriv->timer, jiffies + timer_period());
+		timer_mod(&devpriv->timer, jiffies + timer_period());
 	spin_unlock_irqrestore(&dev->spinlock, flags);
 }
 
drivers/cpufreq/powernv-cpufreq.c +1 -1
index cf10804eef73..a9f09b805192 100644
@@ -653,7 +653,7 @@ static inline void  queue_gpstate_timer(struct global_pstate_info *gpstates)
 	else
 		timer_interval = GPSTATE_TIMER_INTERVAL;
 
-	mod_timer(&gpstates->timer, jiffies + msecs_to_jiffies(timer_interval));
+	timer_mod(&gpstates->timer, jiffies + msecs_to_jiffies(timer_interval));
 }
 
 /**
drivers/crypto/axis/artpec6_crypto.c +1 -1
index 75ee065da1ec..cb58b56f0ab2 100644
@@ -2065,7 +2065,7 @@ static void artpec6_crypto_process_queue(struct artpec6_crypto *ac,
 	 * no noticeable negative effect if we timeout spuriously.
 	 */
 	if (ac->pending_count)
-		mod_timer(&ac->timer, jiffies + msecs_to_jiffies(100));
+		timer_mod(&ac->timer, jiffies + msecs_to_jiffies(100));
 	else
 		timer_delete(&ac->timer);
 }
drivers/dma-buf/st-dma-fence.c +1 -1
index 50b3d28eff47..0a4fe4c87c50 100644
@@ -398,7 +398,7 @@ static int test_wait_timeout(void *arg)
 		goto err_free;
 	}
 
-	mod_timer(&wt.timer, jiffies + 1);
+	timer_mod(&wt.timer, jiffies + 1);
 
 	if (dma_fence_wait_timeout(wt.f, false, 2) == -ETIME) {
 		if (timer_pending(&wt.timer)) {
drivers/dma/imx-dma.c +1 -1
index d4a7e8eaf901..4b57df3bf9fd 100644
@@ -433,7 +433,7 @@ static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)
 				/* FIXME: The timeout should probably be
 				 * configurable
 				 */
-				mod_timer(&imxdmac->watchdog,
+				timer_mod(&imxdmac->watchdog,
 					jiffies + msecs_to_jiffies(500));
 
 				tmp |= CCR_CEN | CCR_RPT | CCR_ACRPT;
drivers/dma/ioat/dma.c +6 -6
index f5f5f221db42..aba1193a91fb 100644
@@ -251,7 +251,7 @@ static void __ioat_restart_chan(struct ioatdma_chan *ioat_chan)
 	/* set the tail to be re-issued */
 	ioat_chan->issued = ioat_chan->tail;
 	ioat_chan->dmacount = 0;
-	mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
+	timer_mod(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
 
 	dev_dbg(to_dev(ioat_chan),
 		"%s: head: %#x tail: %#x issued: %#x count: %#x\n",
@@ -317,7 +317,7 @@ static dma_cookie_t ioat_tx_submit_unlock(struct dma_async_tx_descriptor *tx)
 	dev_dbg(to_dev(ioat_chan), "%s: cookie: %d\n", __func__, cookie);
 
 	if (!test_and_set_bit(IOAT_CHAN_ACTIVE, &ioat_chan->state))
-		mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
+		timer_mod(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
 
 	/* make descriptor updates visible before advancing ioat->head,
 	 * this is purposefully not smp_wmb() since we are also
@@ -488,7 +488,7 @@ int ioat_check_space_lock(struct ioatdma_chan *ioat_chan, int num_descs)
 	 */
 	if (time_is_before_jiffies(ioat_chan->timer.expires)
 	    && timer_pending(&ioat_chan->timer)) {
-		mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
+		timer_mod(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
 		ioat_timer_event(&ioat_chan->timer);
 	}
 
@@ -548,7 +548,7 @@ static bool ioat_cleanup_preamble(struct ioatdma_chan *ioat_chan,
 		return false;
 
 	clear_bit(IOAT_COMPLETION_ACK, &ioat_chan->state);
-	mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
+	timer_mod(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
 
 	return true;
 }
@@ -874,7 +874,7 @@ static void ioat_eh(struct ioatdma_chan *ioat_chan)
 static void check_active(struct ioatdma_chan *ioat_chan)
 {
 	if (ioat_ring_active(ioat_chan)) {
-		mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
+		timer_mod(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
 		return;
 	}
 
@@ -978,7 +978,7 @@ void ioat_timer_event(struct timer_list *t)
 	}
 
 	set_bit(IOAT_COMPLETION_ACK, &ioat_chan->state);
-	mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
+	timer_mod(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
 unlock_out:
 	spin_unlock_bh(&ioat_chan->cleanup_lock);
 }
drivers/firewire/core-transaction.c +1 -1
index ea2ad71c1a5d..feddc7023c98 100644
@@ -141,7 +141,7 @@ static void start_split_transaction_timeout(struct fw_transaction *t,
 		return;
 
 	t->is_split_transaction = true;
-	mod_timer(&t->split_timeout_timer,
+	timer_mod(&t->split_timeout_timer,
 		  jiffies + card->split_timeout_jiffies);
 }
 
drivers/firmware/psci/psci_checker.c +1 -1
index b662b7e28b80..66026728c73a 100644
@@ -309,7 +309,7 @@ static int suspend_test_thread(void *arg)
 			 * suspend_cpu() takes care of switching to a broadcast
 			 * tick, so the timer will still wake us up.
 			 */
-			mod_timer(&wakeup_timer, jiffies +
+			timer_mod(&wakeup_timer, jiffies +
 				  usecs_to_jiffies(state->target_residency));
 
 			/* IRQs must be disabled during suspend operations. */
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1 -1
index 44f5319166bf..e76574469a4d 100644
@@ -253,7 +253,7 @@ int amdgpu_fence_emit_polling(struct amdgpu_ring *ring, uint32_t *s,
  */
 static void amdgpu_fence_schedule_fallback(struct amdgpu_ring *ring)
 {
-	mod_timer(&ring->fence_drv.fallback_timer,
+	timer_mod(&ring->fence_drv.fallback_timer,
 		  jiffies + AMDGPU_FENCE_JIFFIES_TIMEOUT);
 }
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +1 -1
index f847d18f3b4a..8195001fe665 100644
@@ -130,7 +130,7 @@ static void amdgpu_mux_resubmit_chunks(struct amdgpu_ring_mux *mux)
 
 static void amdgpu_ring_mux_schedule_resubmit(struct amdgpu_ring_mux *mux)
 {
-	mod_timer(&mux->resubmit_timer, jiffies + AMDGPU_MUX_RESUBMIT_JIFFIES_TIMEOUT);
+	timer_mod(&mux->resubmit_timer, jiffies + AMDGPU_MUX_RESUBMIT_JIFFIES_TIMEOUT);
 }
 
 static void amdgpu_mux_resubmit_fallback(struct timer_list *t)
drivers/gpu/drm/bridge/tda998x_drv.c +1 -1
index 28a4e843e425..4b8b118f01e6 100644
@@ -761,7 +761,7 @@ static void tda998x_edid_delay_done(struct timer_list *t)
 static void tda998x_edid_delay_start(struct tda998x_priv *priv)
 {
 	priv->edid_delay_active = true;
-	mod_timer(&priv->edid_delay_timer, jiffies + HZ/10);
+	timer_mod(&priv->edid_delay_timer, jiffies + HZ/10);
 }
 
 static int tda998x_edid_delay_wait(struct tda998x_priv *priv)
drivers/gpu/drm/drm_vblank.c +1 -1
index dac121faa2e0..4e64aeb0cec6 100644
@@ -1254,7 +1254,7 @@ void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
 		else if (vblank_offdelay < 0)
 			vblank_disable_fn(&vblank->disable_timer);
 		else if (!vblank->config.disable_immediate)
-			mod_timer(&vblank->disable_timer,
+			timer_mod(&vblank->disable_timer,
 				  jiffies + ((vblank_offdelay * HZ) / 1000));
 	}
 }
drivers/gpu/drm/exynos/exynos_drm_vidi.c +2 -2
index a6c88eea4ef6..adb1d56c5ae2 100644
@@ -98,7 +98,7 @@ static int vidi_enable_vblank(struct exynos_drm_crtc *crtc)
 	if (ctx->suspended)
 		return -EPERM;
 
-	mod_timer(&ctx->timer,
+	timer_mod(&ctx->timer,
 		jiffies + msecs_to_jiffies(VIDI_REFRESH_TIME) - 1);
 
 	return 0;
@@ -162,7 +162,7 @@ static void vidi_fake_vblank_timer(struct timer_list *t)
 	struct vidi_context *ctx = timer_container_of(ctx, t, timer);
 
 	if (drm_crtc_handle_vblank(&ctx->crtc->base))
-		mod_timer(&ctx->timer,
+		timer_mod(&ctx->timer,
 			jiffies + msecs_to_jiffies(VIDI_REFRESH_TIME) - 1);
 }
 
drivers/gpu/drm/gud/gud_pipe.c +1 -1
index 6982cb13de12..31d2b04b0b91 100644
@@ -250,7 +250,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)
 		return ret;
 
 	timer_setup_on_stack(&ctx.timer, gud_usb_bulk_timeout, 0);
-	mod_timer(&ctx.timer, jiffies + msecs_to_jiffies(3000));
+	timer_mod(&ctx.timer, jiffies + msecs_to_jiffies(3000));
 
 	usb_sg_wait(&ctx.sgr);
 
drivers/gpu/drm/i915/gt/intel_rps.c +2 -2
index f8226a11dd7c..4820f503f9d7 100644
@@ -146,7 +146,7 @@ static void rps_timer(struct timer_list *t)
 			rps->last_adj = 0;
 		}
 
-		mod_timer(&rps->timer,
+		timer_mod(&rps->timer,
 			  jiffies + msecs_to_jiffies(rps->pm_interval));
 		rps->pm_interval = min(rps->pm_interval * 2, BUSY_MAX_EI);
 	}
@@ -156,7 +156,7 @@ static void rps_start_timer(struct intel_rps *rps)
 {
 	rps->pm_timestamp = ktime_sub(ktime_get(), rps->pm_timestamp);
 	rps->pm_interval = 1;
-	mod_timer(&rps->timer, jiffies + 1);
+	timer_mod(&rps->timer, jiffies + 1);
 }
 
 static void rps_stop_timer(struct intel_rps *rps)
drivers/gpu/drm/i915/gt/mock_engine.c +2 -2
index 79741f043f03..f9fab3160dbd 100644
@@ -125,7 +125,7 @@ static void hw_delay_complete(struct timer_list *t)
 	 */
 	while ((request = first_request(engine))) {
 		if (request->mock.delay) {
-			mod_timer(&engine->hw_delay,
+			timer_mod(&engine->hw_delay,
 				  jiffies + request->mock.delay);
 			break;
 		}
@@ -245,7 +245,7 @@ static void mock_submit_request(struct i915_request *request)
 	list_add_tail(&request->mock.link, &engine->hw_queue);
 	if (list_is_first(&request->mock.link, &engine->hw_queue)) {
 		if (request->mock.delay)
-			mod_timer(&engine->hw_delay,
+			timer_mod(&engine->hw_delay,
 				  jiffies + request->mock.delay);
 		else
 			advance(request);
drivers/gpu/drm/i915/gt/selftest_execlists.c +1 -1
index 0454eb1814bb..2860656c61c8 100644
@@ -2493,7 +2493,7 @@ static int live_suppress_self_preempt(void *arg)
 		}
 
 		/* Keep postponing the timer to avoid premature slicing */
-		mod_timer(&engine->execlists.timer, jiffies + HZ);
+		timer_mod(&engine->execlists.timer, jiffies + HZ);
 		for (depth = 0; depth < 8; depth++) {
 			rq_b = spinner_create_request(&b.spin,
 						      b.ctx, engine,
drivers/gpu/drm/i915/gt/selftest_migrate.c +1 -1
index 0f6589260e33..8b1261bfdd4f 100644
@@ -640,7 +640,7 @@ static int live_emit_pte_full_ring(void *arg)
 				    I915_EMIT_PTE_NUM_DWORDS * sizeof(u32)));
 
 	timer_setup_on_stack(&st.timer, spinner_kill, 0);
-	mod_timer(&st.timer, jiffies + 2 * HZ);
+	timer_mod(&st.timer, jiffies + 2 * HZ);
 
 	/*
 	 * This should wait for the spinner to be killed, otherwise we should go
drivers/gpu/drm/i915/i915_sw_fence.c +1 -1
index dadc7641e574..56367b22f524 100644
@@ -517,7 +517,7 @@ int i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
 
 		timer_setup(&timer->timer,
 			    timer_i915_sw_fence_wake, TIMER_IRQSAFE);
-		mod_timer(&timer->timer, round_jiffies_up(jiffies + timeout));
+		timer_mod(&timer->timer, round_jiffies_up(jiffies + timeout));
 
 		func = dma_i915_sw_fence_wake_timer;
 	}
drivers/gpu/drm/i915/i915_utils.c +1 -1
index b60c28fbd207..f5d8f6e2318b 100644
@@ -74,7 +74,7 @@ void set_timer_ms(struct timer_list *t, unsigned long timeout)
 	barrier();
 
 	/* Keep t->expires = 0 reserved to indicate a canceled timer. */
-	mod_timer(t, jiffies + timeout ?: 1);
+	timer_mod(t, jiffies + timeout ?: 1);
 }
 
 bool i915_vtd_active(struct drm_i915_private *i915)
drivers/gpu/drm/i915/intel_wakeref.c +1 -1
index 51561b190b93..555b8eaee58b 100644
@@ -187,7 +187,7 @@ void intel_wakeref_auto(struct intel_wakeref_auto *wf, unsigned long timeout)
 	 * callback and so need to cancel the local inc by running the
 	 * elided callback to keep the wf->count balanced.
 	 */
-	if (mod_timer(&wf->timer, jiffies + timeout))
+	if (timer_mod(&wf->timer, jiffies + timeout))
 		wakeref_auto_timeout(&wf->timer);
 }
 
drivers/gpu/drm/i915/selftests/lib_sw_fence.c +1 -1
index 47703716c9f2..7b32188f6572 100644
@@ -67,7 +67,7 @@ void timed_fence_init(struct timed_fence *tf, unsigned long expires)
 	timer_setup_on_stack(&tf->timer, timed_fence_wake, 0);
 
 	if (time_after(expires, jiffies))
-		mod_timer(&tf->timer, expires);
+		timer_mod(&tf->timer, expires);
 	else
 		i915_sw_fence_commit(&tf->fence);
 }
drivers/gpu/drm/mediatek/mtk_dp.c +1 -1
index 9b3b27b4d480..7ef99f83531a 100644
@@ -1995,7 +1995,7 @@ static irqreturn_t mtk_dp_hpd_event_thread(int hpd, void *dev)
 			       sizeof(mtk_dp->info.audio_cur_cfg));
 
 			mtk_dp->need_debounce = false;
-			mod_timer(&mtk_dp->debounce_timer,
+			timer_mod(&mtk_dp->debounce_timer,
 				  jiffies + msecs_to_jiffies(100) - 1);
 		}
 	}
drivers/gpu/drm/msm/adreno/a5xx_preempt.c +1 -1
index 58a86c84e5a8..f80b1eaddf1c 100644
@@ -155,7 +155,7 @@ void a5xx_preempt_trigger(struct msm_gpu *gpu)
 	a5xx_gpu->next_ring = ring;
 
 	/* Start a timer to catch a stuck preemption */
-	mod_timer(&a5xx_gpu->preempt_timer, jiffies + msecs_to_jiffies(10000));
+	timer_mod(&a5xx_gpu->preempt_timer, jiffies + msecs_to_jiffies(10000));
 
 	/* Set the preemption state to triggered */
 	set_preempt_state(a5xx_gpu, PREEMPT_TRIGGERED);
drivers/gpu/drm/msm/adreno/a6xx_preempt.c +1 -1
index 502453dfcff2..cdc865cd2fb3 100644
@@ -312,7 +312,7 @@ void a6xx_preempt_trigger(struct msm_gpu *gpu)
 	a6xx_gpu->next_ring = ring;
 
 	/* Start a timer to catch a stuck preemption */
-	mod_timer(&a6xx_gpu->preempt_timer, jiffies + msecs_to_jiffies(10000));
+	timer_mod(&a6xx_gpu->preempt_timer, jiffies + msecs_to_jiffies(10000));
 
 	/* Enable or disable postamble as needed */
 	sysprof = refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -1
index 51844072bfed..40ffb62c0d30 100644
@@ -2126,7 +2126,7 @@ void dpu_encoder_start_frame_done_timer(struct drm_encoder *drm_enc)
 			drm_mode_vrefresh(&drm_enc->crtc->state->adjusted_mode);
 
 	atomic_set(&dpu_enc->frame_done_timeout_ms, timeout_ms);
-	mod_timer(&dpu_enc->frame_done_timer,
+	timer_mod(&dpu_enc->frame_done_timer,
 			jiffies + msecs_to_jiffies(timeout_ms));
 
 }
drivers/gpu/drm/msm/msm_gpu.c +1 -1
index 197871fdf508..d5208fedb03c 100644
@@ -500,7 +500,7 @@ static void fault_worker(struct kthread_work *work)
 static void hangcheck_timer_reset(struct msm_gpu *gpu)
 {
 	struct msm_drm_private *priv = gpu->dev->dev_private;
-	mod_timer(&gpu->hangcheck_timer,
+	timer_mod(&gpu->hangcheck_timer,
 			round_jiffies_up(jiffies + msecs_to_jiffies(priv->hangcheck_period)));
 }
 
drivers/gpu/drm/omapdrm/dss/dsi.c +1 -1
index 9b9cc593790c..29bc2bc0c0f5 100644
@@ -3160,7 +3160,7 @@ static void dsi_update_screen_dispc(struct dsi_data *dsi)
 		dsi_vc_send_bta(dsi, vc);
 
 #ifdef DSI_CATCH_MISSING_TE
-		mod_timer(&dsi->te_timer, jiffies + msecs_to_jiffies(250));
+		timer_mod(&dsi->te_timer, jiffies + msecs_to_jiffies(250));
 #endif
 	}
 }
drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1 -1
index 3042d0f7a117..60f8c3f52619 100644
@@ -196,7 +196,7 @@ static int threaded_ttm_bo_reserve(void *arg)
 	timer_setup_on_stack(&s_timer.timer, &signal_for_ttm_bo_reserve, 0);
 	s_timer.ctx = &ctx;
 
-	mod_timer(&s_timer.timer, msecs_to_jiffies(100));
+	timer_mod(&s_timer.timer, msecs_to_jiffies(100));
 
 	err = ttm_bo_reserve(bo, interruptible, no_wait, &ctx);
 
drivers/gpu/drm/vc4/vc4_bo.c +1 -1
index 4aaa587be3a5..ff067811d05a 100644
@@ -526,7 +526,7 @@ static void vc4_bo_cache_free_old(struct drm_device *dev)
 		struct vc4_bo *bo = list_last_entry(&vc4->bo_cache.time_list,
 						    struct vc4_bo, unref_head);
 		if (time_before(expire_time, bo->free_time)) {
-			mod_timer(&vc4->bo_cache.time_timer,
+			timer_mod(&vc4->bo_cache.time_timer,
 				  round_jiffies_up(jiffies +
 						   msecs_to_jiffies(1000)));
 			return;
drivers/gpu/drm/vc4/vc4_gem.c +1 -1
index 255e5817618e..9519d2c999d2 100644
@@ -42,7 +42,7 @@ vc4_queue_hangcheck(struct drm_device *dev)
 {
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 
-	mod_timer(&vc4->hangcheck.timer,
+	timer_mod(&vc4->hangcheck.timer,
 		  round_jiffies_up(jiffies + msecs_to_jiffies(100)));
 }
 
drivers/gpu/drm/vgem/vgem_fence.c +1 -1
index 145ea549fc0a..1cdd1f19c07e 100644
@@ -97,7 +97,7 @@ static struct dma_fence *vgem_fence_create(struct vgem_file *vfile,
 	timer_setup(&fence->timer, vgem_fence_timeout, 0);
 
 	/* We force the fence to expire within 10s to prevent driver hangs */
-	mod_timer(&fence->timer, jiffies + VGEM_FENCE_TIMEOUT);
+	timer_mod(&fence->timer, jiffies + VGEM_FENCE_TIMEOUT);
 
 	return &fence->base;
 }
drivers/hid/hid-apple.c +2 -2
index 0639b1f43d88..be1f7618c7b6 100644
@@ -618,7 +618,7 @@ static void apple_battery_timer_tick(struct timer_list *t)
 	struct hid_device *hdev = asc->hdev;
 
 	if (apple_fetch_battery(hdev) == 0) {
-		mod_timer(&asc->battery_timer,
+		timer_mod(&asc->battery_timer,
 			  jiffies + msecs_to_jiffies(APPLE_BATTERY_TIMEOUT_MS));
 	}
 }
@@ -934,7 +934,7 @@ static int apple_probe(struct hid_device *hdev,
 	}
 
 	timer_setup(&asc->battery_timer, apple_battery_timer_tick, 0);
-	mod_timer(&asc->battery_timer,
+	timer_mod(&asc->battery_timer,
 		  jiffies + msecs_to_jiffies(APPLE_BATTERY_TIMEOUT_MS));
 	apple_fetch_battery(hdev);
 
drivers/hid/hid-appleir.c +2 -2
index 5e8ced7bc05a..d8851c80b0ae 100644
@@ -217,7 +217,7 @@ static int appleir_raw_event(struct hid_device *hid, struct hid_report *report,
 			 * the test above, or here set a timer which pulls
 			 * them up after 1/8 s
 			 */
-			mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
+			timer_mod(&appleir->key_up_timer, jiffies + HZ / 8);
 			appleir->prev_key_idx = 0;
 		} else
 			/* Remember key for next packet */
@@ -234,7 +234,7 @@ static int appleir_raw_event(struct hid_device *hid, struct hid_report *report,
 		 * Remote doesn't do key up, either pull them up, in the test
 		 * above, or here set a timer which pulls them up after 1/8 s
 		 */
-		mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
+		timer_mod(&appleir->key_up_timer, jiffies + HZ / 8);
 		goto out;
 	}
 
drivers/hid/hid-appletb-kbd.c +3 -3
index b32776ceac0a..8eda00070da6 100644
@@ -172,7 +172,7 @@ static void appletb_inactivity_timer(struct timer_list *t)
 		if (!kbd->has_dimmed) {
 			backlight_device_set_brightness(kbd->backlight_dev, 1);
 			kbd->has_dimmed = true;
-			mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_idle_timeout * 1000));
+			timer_mod(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_idle_timeout * 1000));
 		} else if (!kbd->has_turned_off) {
 			backlight_device_set_brightness(kbd->backlight_dev, 0);
 			kbd->has_turned_off = true;
@@ -188,7 +188,7 @@ static void reset_inactivity_timer(struct appletb_kbd *kbd)
 			kbd->has_dimmed = false;
 			kbd->has_turned_off = false;
 		}
-		mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));
+		timer_mod(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));
 	}
 }
 
@@ -407,7 +407,7 @@ static int appletb_kbd_probe(struct hid_device *hdev, const struct hid_device_id
 	} else {
 		backlight_device_set_brightness(kbd->backlight_dev, 2);
 		timer_setup(&kbd->inactivity_timer, appletb_inactivity_timer, 0);
-		mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));
+		timer_mod(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));
 	}
 
 	kbd->inp_handler.event = appletb_kbd_inp_event;
drivers/hid/hid-letsketch.c +1 -1
index 4df42c5b6e88..8e47405dec91 100644
@@ -190,7 +190,7 @@ static int letsketch_raw_event(struct hid_device *hdev,
 		 * There is no out of range event, so use a timer for this
 		 * when in range we get an event approx. every 8 ms.
 		 */
-		mod_timer(&data->inrange_timer, jiffies + msecs_to_jiffies(100));
+		timer_mod(&data->inrange_timer, jiffies + msecs_to_jiffies(100));
 		break;
 	case 0xe0: /* Pad data */
 		input = data->input_tablet_pad;
drivers/hid/hid-magicmouse.c +2 -2
index 4c6a0ef64e0d..dff8dc363285 100644
@@ -813,7 +813,7 @@ static void magicmouse_battery_timer_tick(struct timer_list *t)
 	struct hid_device *hdev = msc->hdev;
 
 	if (magicmouse_fetch_battery(hdev) == 0) {
-		mod_timer(&msc->battery_timer,
+		timer_mod(&msc->battery_timer,
 			  jiffies + msecs_to_jiffies(USB_BATTERY_TIMEOUT_MS));
 	}
 }
@@ -851,7 +851,7 @@ static int magicmouse_probe(struct hid_device *hdev,
 	}
 
 	timer_setup(&msc->battery_timer, magicmouse_battery_timer_tick, 0);
-	mod_timer(&msc->battery_timer,
+	timer_mod(&msc->battery_timer,
 		  jiffies + msecs_to_jiffies(USB_BATTERY_TIMEOUT_MS));
 	magicmouse_fetch_battery(hdev);
 
drivers/hid/hid-multitouch.c +1 -1
index 3d6dee383b6f..7faa7f2d464c 100644
@@ -1296,7 +1296,7 @@ static void mt_touch_report(struct hid_device *hid,
 	 */
 	if (app->quirks & MT_QUIRK_STICKY_FINGERS) {
 		if (test_bit(MT_IO_FLAGS_PENDING_SLOTS, &td->mt_io_flags))
-			mod_timer(&td->release_timer,
+			timer_mod(&td->release_timer,
 				  jiffies + msecs_to_jiffies(100));
 		else
 			timer_delete(&td->release_timer);
drivers/hid/hid-nvidia-shield.c +1 -1
index b0c40a245bf8..43e27b35def8 100644
@@ -537,7 +537,7 @@ static void thunderstrike_psy_stats_timer_handler(struct timer_list *timer)
 
 	thunderstrike_request_psy_stats(ts);
 	/* Query battery statistics from device every five minutes */
-	mod_timer(timer, jiffies + 300 * HZ);
+	timer_mod(timer, jiffies + 300 * HZ);
 }
 
 static void
drivers/hid/hid-prodikeys.c +1 -1
index 74bddb2c3e82..d347e0ade0f9 100644
@@ -354,7 +354,7 @@ static int pcmidi_handle_report3(struct pcmidi_snd *pm, u8 *data, int size)
 						pms->velocity = velocity;
 						pms->in_use = 1;
 
-						mod_timer(&pms->timer,
+						timer_mod(&pms->timer,
 							jiffies +
 					msecs_to_jiffies(pm->midi_sustain));
 						return 1;
drivers/hid/hid-sony.c +2 -2
index b966e4044238..540da765c6ee 100644
@@ -539,7 +539,7 @@ static void ghl_magic_poke_cb(struct urb *urb)
 	if (urb->status < 0)
 		hid_err(sc->hdev, "URB transfer failed : %d", urb->status);
 
-	mod_timer(&sc->ghl_poke_timer, jiffies + GHL_GUITAR_POKE_INTERVAL*HZ);
+	timer_mod(&sc->ghl_poke_timer, jiffies + GHL_GUITAR_POKE_INTERVAL*HZ);
 }
 
 static void ghl_magic_poke(struct timer_list *t)
@@ -2146,7 +2146,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 		}
 
 		timer_setup(&sc->ghl_poke_timer, ghl_magic_poke, 0);
-		mod_timer(&sc->ghl_poke_timer,
+		timer_mod(&sc->ghl_poke_timer,
 			  jiffies + GHL_GUITAR_POKE_INTERVAL*HZ);
 	}
 
drivers/hid/hid-uclogic-core.c +1 -1
index 435c52cecf69..7e04f5101887 100644
@@ -324,7 +324,7 @@ static int uclogic_raw_event_pen(struct uclogic_drvdata *drvdata,
 		/* Set in-range bit */
 		data[1] |= 0x40;
 		/* (Re-)start in-range timeout */
-		mod_timer(&drvdata->inrange_timer,
+		timer_mod(&drvdata->inrange_timer,
 				jiffies + msecs_to_jiffies(100));
 	}
 	/* If we report tilt and Y direction is flipped */
drivers/hid/hid-wiimote-core.c +3 -3
index 5b5fc460a4c5..f258843f6f3c 100644
@@ -900,7 +900,7 @@ static void wiimote_init_detect(struct wiimote_data *wdata)
 	spin_lock_irq(&wdata->state.lock);
 	if (!(wdata->state.flags & WIIPROTO_FLAG_BUILTIN_MP) &&
 	    !(wdata->state.flags & WIIPROTO_FLAG_NO_MP))
-		mod_timer(&wdata->timer, jiffies + HZ * 4);
+		timer_mod(&wdata->timer, jiffies + HZ * 4);
 	spin_unlock_irq(&wdata->state.lock);
 }
 
@@ -930,7 +930,7 @@ static void wiimote_init_poll_mp(struct wiimote_data *wdata)
 		wiimote_mp_unload(wdata);
 	}
 
-	mod_timer(&wdata->timer, jiffies + HZ * 4);
+	timer_mod(&wdata->timer, jiffies + HZ * 4);
 }
 
 /*
@@ -1176,7 +1176,7 @@ static void wiimote_init_hotplug(struct wiimote_data *wdata)
 		/* reschedule MP hotplug timer */
 		if (!(flags & WIIPROTO_FLAG_BUILTIN_MP) &&
 		    !(flags & WIIPROTO_FLAG_NO_MP))
-			mod_timer(&wdata->timer, jiffies + HZ * 4);
+			timer_mod(&wdata->timer, jiffies + HZ * 4);
 	}
 
 	spin_lock_irq(&wdata->state.lock);
drivers/hid/usbhid/hid-core.c +1 -1
index be325495c132..53464700088d 100644
@@ -176,7 +176,7 @@ static void hid_io_error(struct hid_device *hid)
 		}
 	}
 
-	mod_timer(&usbhid->io_retry,
+	timer_mod(&usbhid->io_retry,
 			jiffies + msecs_to_jiffies(usbhid->retry_delay));
 done:
 	spin_unlock_irqrestore(&usbhid->lock, flags);
drivers/hid/wacom_wac.c +1 -1
index 955b39d22524..98033ca97f15 100644
@@ -2416,7 +2416,7 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *field
 		value = field->logical_maximum - value;
 		break;
 	case HID_DG_INRANGE:
-		mod_timer(&wacom->idleprox_timer, jiffies + msecs_to_jiffies(100));
+		timer_mod(&wacom->idleprox_timer, jiffies + msecs_to_jiffies(100));
 		wacom_wac->hid_data.inrange_state = value;
 		if (!(features->quirks & WACOM_QUIRK_SENSE))
 			wacom_wac->hid_data.sense_state = value;
drivers/hsi/clients/ssi_protocol.c +7 -7
index d10a01f3eb9e..e3c18362938e 100644
@@ -291,9 +291,9 @@ static void ssip_set_rxstate(struct ssi_protocol *ssi, unsigned int state)
 			break;
 		fallthrough;
 	case RECEIVING:
-		mod_timer(&ssi->keep_alive, jiffies +
+		timer_mod(&ssi->keep_alive, jiffies +
 						msecs_to_jiffies(SSIP_KATOUT));
-		mod_timer(&ssi->rx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
+		timer_mod(&ssi->rx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
 		break;
 	default:
 		break;
@@ -313,9 +313,9 @@ static void ssip_set_txstate(struct ssi_protocol *ssi, unsigned int state)
 	case WAIT4READY:
 	case SENDING:
 	case SENDING_SWBREAK:
-		mod_timer(&ssi->keep_alive,
+		timer_mod(&ssi->keep_alive,
 				jiffies + msecs_to_jiffies(SSIP_KATOUT));
-		mod_timer(&ssi->tx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
+		timer_mod(&ssi->tx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
 		break;
 	default:
 		break;
@@ -474,7 +474,7 @@ static void ssip_keep_alive(struct timer_list *t)
 			spin_unlock(&ssi->lock);
 			return;
 		}
-	mod_timer(&ssi->keep_alive, jiffies + msecs_to_jiffies(SSIP_KATOUT));
+	timer_mod(&ssi->keep_alive, jiffies + msecs_to_jiffies(SSIP_KATOUT));
 	spin_unlock(&ssi->lock);
 }
 
@@ -679,7 +679,7 @@ static void ssip_rx_bootinforeq(struct hsi_client *cl, u32 cmd)
 
 		spin_lock_bh(&ssi->lock);
 		/* Start boot handshake watchdog */
-		mod_timer(&ssi->tx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
+		timer_mod(&ssi->tx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
 		spin_unlock_bh(&ssi->lock);
 		dev_dbg(&cl->device, "Send BOOTINFO_RESP\n");
 		if (SSIP_DATA_VERSION(cmd) != SSIP_LOCAL_VERID)
@@ -705,7 +705,7 @@ static void ssip_rx_bootinforesp(struct hsi_client *cl, u32 cmd)
 	spin_lock_bh(&ssi->lock);
 	if (ssi->main_state != ACTIVE)
 		/* Use tx_wd as a boot watchdog in non ACTIVE state */
-		mod_timer(&ssi->tx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
+		timer_mod(&ssi->tx_wd, jiffies + msecs_to_jiffies(SSIP_WDTOUT));
 	else
 		dev_dbg(&cl->device, "boot info resp ignored M(%d)\n",
 							ssi->main_state);
drivers/hte/hte-tegra194-test.c +2 -2
index 94e931f45305..ff412b2716fc 100644
@@ -82,7 +82,7 @@ static void gpio_timer_cb(struct timer_list *t)
 	(void)t;
 
 	gpiod_set_value(hte.gpio_out, !gpiod_get_value(hte.gpio_out));
-	mod_timer(&hte.timer, jiffies + msecs_to_jiffies(8000));
+	timer_mod(&hte.timer, jiffies + msecs_to_jiffies(8000));
 }
 
 static irqreturn_t tegra_hte_test_gpio_isr(int irq, void *data)
@@ -195,7 +195,7 @@ static int tegra_hte_test_probe(struct platform_device *pdev)
 	}
 
 	timer_setup(&hte.timer, gpio_timer_cb, 0);
-	mod_timer(&hte.timer, jiffies + msecs_to_jiffies(5000));
+	timer_mod(&hte.timer, jiffies + msecs_to_jiffies(5000));
 
 	return 0;
 
drivers/hwmon/pwm-fan.c +2 -2
index 0c03bbadaddb..42a7a5cf057f 100644
@@ -96,7 +96,7 @@ static void sample_timer(struct timer_list *t)
 		ctx->sample_start = ktime_get();
 	}
 
-	mod_timer(&ctx->rpm_timer, jiffies + HZ);
+	timer_mod(&ctx->rpm_timer, jiffies + HZ);
 }
 
 static void pwm_fan_enable_mode_2_state(int enable_mode,
@@ -643,7 +643,7 @@ static int pwm_fan_probe(struct platform_device *pdev)
 
 	if (ctx->tach_count > 0) {
 		ctx->sample_start = ktime_get();
-		mod_timer(&ctx->rpm_timer, jiffies + HZ);
+		timer_mod(&ctx->rpm_timer, jiffies + HZ);
 
 		channels[1] = &ctx->fan_channel;
 	}
drivers/i2c/busses/i2c-img-scb.c +3 -3
index 3278707bb885..20232a4f1d67 100644
@@ -595,7 +595,7 @@ static void img_i2c_read(struct img_i2c *i2c)
 	img_i2c_writel(i2c, SCB_READ_ADDR_REG, i2c->msg.addr);
 	img_i2c_writel(i2c, SCB_READ_COUNT_REG, i2c->msg.len);
 
-	mod_timer(&i2c->check_timer, jiffies + msecs_to_jiffies(1));
+	timer_mod(&i2c->check_timer, jiffies + msecs_to_jiffies(1));
 }
 
 /* Start a write transaction in automatic mode */
@@ -608,7 +608,7 @@ static void img_i2c_write(struct img_i2c *i2c)
 	img_i2c_writel(i2c, SCB_WRITE_ADDR_REG, i2c->msg.addr);
 	img_i2c_writel(i2c, SCB_WRITE_COUNT_REG, i2c->msg.len);
 
-	mod_timer(&i2c->check_timer, jiffies + msecs_to_jiffies(1));
+	timer_mod(&i2c->check_timer, jiffies + msecs_to_jiffies(1));
 	img_i2c_write_fifo(i2c);
 
 	/* img_i2c_write_fifo() may modify int_enable */
@@ -876,7 +876,7 @@ static unsigned int img_i2c_auto(struct img_i2c *i2c,
 		i2c->int_enable &= ~INT_SLAVE_EVENT;
 	}
 
-	mod_timer(&i2c->check_timer, jiffies + msecs_to_jiffies(1));
+	timer_mod(&i2c->check_timer, jiffies + msecs_to_jiffies(1));
 
 	if (int_status & INT_STOP_DETECTED) {
 		/* Drain remaining data in FIFO and complete transaction */
drivers/iio/common/ssp_sensors/ssp_dev.c +2 -2
index a6ffb64a1187..bc0708c2b26e 100644
@@ -180,12 +180,12 @@ static void ssp_wdt_timer_func(struct timer_list *t)
 	    data->com_fail_cnt > SSP_LIMIT_RESET_CNT)
 		queue_work(system_power_efficient_wq, &data->work_wdt);
 _mod:
-	mod_timer(&data->wdt_timer, jiffies + msecs_to_jiffies(SSP_WDT_TIME));
+	timer_mod(&data->wdt_timer, jiffies + msecs_to_jiffies(SSP_WDT_TIME));
 }
 
 static void ssp_enable_wdt_timer(struct ssp_data *data)
 {
-	mod_timer(&data->wdt_timer, jiffies + msecs_to_jiffies(SSP_WDT_TIME));
+	timer_mod(&data->wdt_timer, jiffies + msecs_to_jiffies(SSP_WDT_TIME));
 }
 
 static void ssp_disable_wdt_timer(struct ssp_data *data)
drivers/infiniband/hw/hfi1/aspm.c +1 -1
index 79990d09522b..1f77d80f3e89 100644
@@ -158,7 +158,7 @@ void __aspm_ctx_disable(struct hfi1_ctxtdata *rcd)
 	}
 
 	if (restart_timer) {
-		mod_timer(&rcd->aspm_timer,
+		timer_mod(&rcd->aspm_timer,
 			  jiffies + msecs_to_jiffies(ASPM_TIMER_MS));
 		rcd->aspm_ts_timer_sched = now;
 	}
drivers/infiniband/hw/hfi1/chip.c +4 -4
index a5eb009a0db7..a4f41487252c 100644
@@ -5562,7 +5562,7 @@ static void update_rcverr_timer(struct timer_list *t)
 	}
 	dd->rcv_ovfl_cnt = (u32)cur_ovfl_cnt;
 
-	mod_timer(&dd->rcverr_timer, jiffies + HZ * RCVERR_CHECK_TIME);
+	timer_mod(&dd->rcverr_timer, jiffies + HZ * RCVERR_CHECK_TIME);
 }
 
 static int init_rcverr(struct hfi1_devdata *dd)
@@ -5570,7 +5570,7 @@ static int init_rcverr(struct hfi1_devdata *dd)
 	timer_setup(&dd->rcverr_timer, update_rcverr_timer, 0);
 	/* Assume the hardware counter has been reset */
 	dd->rcv_ovfl_cnt = 0;
-	return mod_timer(&dd->rcverr_timer, jiffies + HZ * RCVERR_CHECK_TIME);
+	return timer_mod(&dd->rcverr_timer, jiffies + HZ * RCVERR_CHECK_TIME);
 }
 
 static void free_rcverr(struct hfi1_devdata *dd)
@@ -12590,7 +12590,7 @@ static void update_synth_timer(struct timer_list *t)
 	struct hfi1_devdata *dd = timer_container_of(dd, t, synth_stats_timer);
 
 	queue_work(dd->update_cntr_wq, &dd->update_cntr_work);
-	mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
+	timer_mod(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
 }
 
 #define C_MAX_NAME 16 /* 15 chars + one for /0 */
@@ -12833,7 +12833,7 @@ static int init_cntrs(struct hfi1_devdata *dd)
 
 	INIT_WORK(&dd->update_cntr_work, do_update_synth_timer);
 
-	mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
+	timer_mod(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
 	return 0;
 bail:
 	free_cntrs(dd);
drivers/infiniband/hw/hfi1/driver.c +1 -1
index 2d12278ec96a..d8979b959188 100644
@@ -1332,7 +1332,7 @@ static void run_led_override(struct timer_list *t)
 	/* Set up for next phase */
 	ppd->led_override_phase = !ppd->led_override_phase;
 
-	mod_timer(&ppd->led_override_timer, jiffies + timeout);
+	timer_mod(&ppd->led_override_timer, jiffies + timeout);
 }
 
 /*
drivers/infiniband/hw/hfi1/mad.c +1 -1
index 961fa07116f0..66d67bbbd8f4 100644
@@ -172,7 +172,7 @@ static struct trap_node *check_and_add_trap(struct hfi1_ibport *ibp,
 		 */
 		timeout = (RVT_TRAP_TIMEOUT *
 			   (1UL << ibp->rvp.subnet_timeout)) / 1000;
-		mod_timer(&ibp->rvp.trap_timer,
+		timer_mod(&ibp->rvp.trap_timer,
 			  jiffies + usecs_to_jiffies(timeout));
 		node = list_first_entry(&trap_list->list, struct trap_node,
 					list);
drivers/infiniband/hw/hfi1/sdma.c +1 -1
index 24c0704544a5..9a335f149e03 100644
@@ -460,7 +460,7 @@ static void sdma_err_progress_check_schedule(struct sdma_engine *sde)
 		dd_dev_err(sde->dd,
 			   "SDMA engine %d - check scheduled\n",
 				sde->this_idx);
-		mod_timer(&sde->err_progress_check_timer, jiffies + 10);
+		timer_mod(&sde->err_progress_check_timer, jiffies + 10);
 	}
 }
 
drivers/infiniband/hw/hfi1/tid_rdma.c +2 -2
index 73a600aea617..ef66645180d3 100644
@@ -3954,7 +3954,7 @@ static void hfi1_mod_tid_reap_timer(struct rvt_qp *qp)
 
 	lockdep_assert_held(&qp->s_lock);
 	qpriv->s_flags |= HFI1_R_TID_RSC_TIMER;
-	mod_timer(&qpriv->s_tid_timer, jiffies +
+	timer_mod(&qpriv->s_tid_timer, jiffies +
 		  qpriv->tid_timer_timeout_jiffies);
 }
 
@@ -4770,7 +4770,7 @@ static void hfi1_mod_tid_retry_timer(struct rvt_qp *qp)
 
 	lockdep_assert_held(&qp->s_lock);
 	priv->s_flags |= HFI1_S_TID_RETRY_TIMER;
-	mod_timer(&priv->s_tid_retry_timer, jiffies +
+	timer_mod(&priv->s_tid_retry_timer, jiffies +
 		  priv->tid_retry_timeout_jiffies + rdi->busy_jiffies);
 }
 
drivers/infiniband/hw/hfi1/verbs.c +2 -2
index 3cbbfccdd8cd..72801e7fb225 100644
@@ -570,7 +570,7 @@ static void mem_timer(struct timer_list *t)
 		priv->s_iowait.lock = NULL;
 		/* refcount held until actual wake up */
 		if (!list_empty(list))
-			mod_timer(&dev->mem_timer, jiffies + 1);
+			timer_mod(&dev->mem_timer, jiffies + 1);
 	}
 	write_sequnlock_irqrestore(&dev->iowait_lock, flags);
 
@@ -615,7 +615,7 @@ void hfi1_wait_kmem(struct rvt_qp *qp)
 
 	if (list_empty(&priv->s_iowait.list)) {
 		if (list_empty(&dev->memwait))
-			mod_timer(&dev->mem_timer, jiffies + 1);
+			timer_mod(&dev->mem_timer, jiffies + 1);
 		qp->s_flags |= RVT_S_WAIT_KMEM;
 		list_add_tail(&priv->s_iowait.list, &dev->memwait);
 		priv->s_iowait.lock = &dev->iowait_lock;
drivers/infiniband/hw/irdma/utils.c +2 -2
index 32e775e07afb..b394a37d5a2e 100644
@@ -1545,7 +1545,7 @@ static void irdma_hw_stats_timeout(struct timer_list *t)
 	else
 		irdma_cqp_gather_stats_gen1(sc_vsi->dev, sc_vsi->pestat);
 
-	mod_timer(&pf_devstat->stats_timer,
+	timer_mod(&pf_devstat->stats_timer,
 		  jiffies + msecs_to_jiffies(STATS_TIMER_DELAY));
 }
 
@@ -1558,7 +1558,7 @@ void irdma_hw_stats_start_timer(struct irdma_sc_vsi *vsi)
 	struct irdma_vsi_pestat *devstat = vsi->pestat;
 
 	timer_setup(&devstat->stats_timer, irdma_hw_stats_timeout, 0);
-	mod_timer(&devstat->stats_timer,
+	timer_mod(&devstat->stats_timer,
 		  jiffies + msecs_to_jiffies(STATS_TIMER_DELAY));
 }
 
drivers/infiniband/hw/mlx5/mr.c +1 -1
index 2747b160d199..08a80f8abe99 100644
@@ -205,7 +205,7 @@ static void create_mkey_callback(int status, struct mlx5_async_work *context)
 		ent->pending--;
 		WRITE_ONCE(dev->fill_delay, 1);
 		spin_unlock_irqrestore(&ent->mkeys_queue.lock, flags);
-		mod_timer(&dev->delay_timer, jiffies + HZ);
+		timer_mod(&dev->delay_timer, jiffies + HZ);
 		return;
 	}
 
drivers/infiniband/hw/mthca/mthca_catas.c +1 -1
index 4331aa00c6a7..1ab5b29999df 100644
@@ -141,7 +141,7 @@ static void poll_catas(struct timer_list *t)
 			return;
 		}
 
-	mod_timer(&dev->catas_err.timer,
+	timer_mod(&dev->catas_err.timer,
 		  round_jiffies(jiffies + MTHCA_CATAS_POLL_INTERVAL));
 }
 
drivers/infiniband/hw/qib/qib_driver.c +2 -2
index c3cdf14d32e0..d53c7f727e06 100644
@@ -678,7 +678,7 @@ static void qib_run_led_override(struct timer_list *t)
 	 * it fire one more time after they turn it off to simplify
 	 */
 	if (ppd->led_override_vals[0] || ppd->led_override_vals[1])
-		mod_timer(&ppd->led_override_timer, jiffies + timeoff);
+		timer_mod(&ppd->led_override_timer, jiffies + timeoff);
 }
 
 void qib_set_led_override(struct qib_pportdata *ppd, unsigned int val)
@@ -716,7 +716,7 @@ void qib_set_led_override(struct qib_pportdata *ppd, unsigned int val)
 		timer_add(&ppd->led_override_timer);
 	} else {
 		if (ppd->led_override_vals[0] || ppd->led_override_vals[1])
-			mod_timer(&ppd->led_override_timer, jiffies + 1);
+			timer_mod(&ppd->led_override_timer, jiffies + 1);
 		atomic_dec(&ppd->led_override_timer_active);
 	}
 }
drivers/infiniband/hw/qib/qib_iba6120.c +4 -4
index bb9d089fac7a..17c229b8876c 100644
@@ -2642,7 +2642,7 @@ static void qib_get_6120_faststats(struct timer_list *t)
 
 	qib_chk_6120_errormask(dd);
 done:
-	mod_timer(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
+	timer_mod(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
 }
 
 /* no interrupt fallback for these chips */
@@ -2915,7 +2915,7 @@ static void pma_6120_timer(struct timer_list *t)
 		cs->pma_sample_status = IB_PMA_SAMPLE_STATUS_RUNNING;
 		qib_snapshot_counters(ppd, &cs->sword, &cs->rword,
 				      &cs->spkts, &cs->rpkts, &cs->xmit_wait);
-		mod_timer(&cs->pma_timer,
+		timer_mod(&cs->pma_timer,
 		      jiffies + usecs_to_jiffies(ibp->rvp.pma_sample_interval));
 	} else if (cs->pma_sample_status == IB_PMA_SAMPLE_STATUS_RUNNING) {
 		u64 ta, tb, tc, td, te;
@@ -2942,12 +2942,12 @@ static void qib_set_cntr_6120_sample(struct qib_pportdata *ppd, u32 intv,
 
 	if (start && intv) {
 		cs->pma_sample_status = IB_PMA_SAMPLE_STATUS_STARTED;
-		mod_timer(&cs->pma_timer, jiffies + usecs_to_jiffies(start));
+		timer_mod(&cs->pma_timer, jiffies + usecs_to_jiffies(start));
 	} else if (intv) {
 		cs->pma_sample_status = IB_PMA_SAMPLE_STATUS_RUNNING;
 		qib_snapshot_counters(ppd, &cs->sword, &cs->rword,
 				      &cs->spkts, &cs->rpkts, &cs->xmit_wait);
-		mod_timer(&cs->pma_timer, jiffies + usecs_to_jiffies(intv));
+		timer_mod(&cs->pma_timer, jiffies + usecs_to_jiffies(intv));
 	} else {
 		cs->pma_sample_status = IB_PMA_SAMPLE_STATUS_DONE;
 		cs->sword = 0;
drivers/infiniband/hw/qib/qib_iba7220.c +1 -1
index 2731185dad97..e7de3eb75c8e 100644
@@ -3265,7 +3265,7 @@ static void qib_get_7220_faststats(struct timer_list *t)
 	dd->traffic_wds += traffic_wds;
 	spin_unlock_irqrestore(&dd->eep_st_lock, flags);
 done:
-	mod_timer(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
+	timer_mod(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
 }
 
 /*
drivers/infiniband/hw/qib/qib_iba7322.c +1 -1
index f5beacbd2c46..3ad2e2ad4361 100644
@@ -5128,7 +5128,7 @@ static void qib_get_7322_faststats(struct timer_list *t)
 			force_h1(ppd);
 		}
 	}
-	mod_timer(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
+	timer_mod(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
 }
 
 /*
drivers/infiniband/hw/qib/qib_init.c +3 -3
index 1c45814f5646..a5578725649b 100644
@@ -509,7 +509,7 @@ static void verify_interrupt(struct timer_list *t)
 			dev_err(&dd->pcidev->dev,
 				"No interrupts detected, not usable.\n");
 		else /* re-arm the timer to see if fallback works */
-			mod_timer(&dd->intrchk_timer, jiffies + HZ/2);
+			timer_mod(&dd->intrchk_timer, jiffies + HZ/2);
 	}
 }
 
@@ -757,9 +757,9 @@ int qib_init(struct qib_devdata *dd, int reinit)
 		 * Setup to verify we get an interrupt, and fallback
 		 * to an alternate if necessary and possible.
 		 */
-		mod_timer(&dd->intrchk_timer, jiffies + HZ/2);
+		timer_mod(&dd->intrchk_timer, jiffies + HZ/2);
 		/* start stats retrieval timer */
-		mod_timer(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
+		timer_mod(&dd->stats_timer, jiffies + HZ * ACTIVITY_TIMER);
 	}
 
 	/* if ret is non-zero, we probably should do some cleanup here... */
drivers/infiniband/hw/qib/qib_intr.c +1 -1
index 008cb4b7bd83..7305217fff5d 100644
@@ -133,7 +133,7 @@ void qib_handle_e_ibstatuschanged(struct qib_pportdata *ppd, u64 ibcs)
 			}
 			spin_unlock_irqrestore(&ppd->lflags_lock, flags);
 			/* start a 75msec timer to clear symbol errors */
-			mod_timer(&ppd->symerr_clear_timer,
+			timer_mod(&ppd->symerr_clear_timer,
 				  msecs_to_jiffies(75));
 		} else if (ltstate == IB_PHYSPORTSTATE_LINKUP &&
 			   !(ppd->lflags & QIBL_LINKACTIVE)) {
drivers/infiniband/hw/qib/qib_mad.c +1 -1
index a8d909afa4e6..b1af407517db 100644
@@ -2417,7 +2417,7 @@ static void xmit_wait_timer_func(struct timer_list *t)
 	dd->f_set_cntr_sample(ppd, QIB_CONG_TIMER_PSINTERVAL, 0x0);
 done:
 	spin_unlock_irqrestore(&ppd->ibport_data.rvp.lock, flags);
-	mod_timer(&ppd->cong_stats.timer, jiffies + HZ);
+	timer_mod(&ppd->cong_stats.timer, jiffies + HZ);
 }
 
 void qib_notify_create_mad_agent(struct rvt_dev_info *rdi, int port_idx)
drivers/infiniband/hw/qib/qib_sd7220.c +3 -3
index 58cccc6c94e6..6bae29d2fe84 100644
@@ -1410,7 +1410,7 @@ static void qib_run_relock(struct timer_list *t)
 		cs->relock_interval = timeoff;
 	} else
 		timeoff = HZ;
-	mod_timer(&cs->relock_timer, jiffies + timeoff);
+	timer_mod(&cs->relock_timer, jiffies + timeoff);
 }
 
 void set_7220_relock_poll(struct qib_devdata *dd, int ibup)
@@ -1421,7 +1421,7 @@ void set_7220_relock_poll(struct qib_devdata *dd, int ibup)
 		/* We are now up, relax timer to 1 second interval */
 		if (cs->relock_timer_active) {
 			cs->relock_interval = HZ;
-			mod_timer(&cs->relock_timer, jiffies + HZ);
+			timer_mod(&cs->relock_timer, jiffies + HZ);
 		}
 	} else {
 		/* Transition to down, (re-)set timer to short interval. */
@@ -1439,7 +1439,7 @@ void set_7220_relock_poll(struct qib_devdata *dd, int ibup)
 			timer_add(&cs->relock_timer);
 		} else {
 			cs->relock_interval = timeout;
-			mod_timer(&cs->relock_timer, jiffies + timeout);
+			timer_mod(&cs->relock_timer, jiffies + timeout);
 		}
 	}
 }
drivers/infiniband/hw/qib/qib_tx.c +3 -3
index bac1bd975fb0..89edea8b3c9d 100644
@@ -522,13 +522,13 @@ void qib_hol_down(struct qib_pportdata *ppd)
 /*
  * Link is at INIT.
  * We start the HoL timer so we can detect stuck packets blocking SMP replies.
- * Timer may already be running, so use mod_timer, not timer_add.
+ * Timer may already be running, so use timer_mod, not timer_add.
  */
 void qib_hol_init(struct qib_pportdata *ppd)
 {
 	if (ppd->hol_state != QIB_HOL_INIT) {
 		ppd->hol_state = QIB_HOL_INIT;
-		mod_timer(&ppd->hol_timer,
+		timer_mod(&ppd->hol_timer,
 			  jiffies + msecs_to_jiffies(qib_hol_timeout_ms));
 	}
 }
@@ -560,7 +560,7 @@ void qib_hol_event(struct timer_list *t)
 		 * SMP replies.
 		 */
 		qib_hol_down(ppd);
-		mod_timer(&ppd->hol_timer,
+		timer_mod(&ppd->hol_timer,
 			  jiffies + msecs_to_jiffies(qib_hol_timeout_ms));
 	}
 }
drivers/infiniband/hw/qib/qib_verbs.c +2 -2
index bab657f93084..ce0bec788172 100644
@@ -374,7 +374,7 @@ static void mem_timer(struct timer_list *t)
 		list_del_init(&priv->iowait);
 		rvt_get_qp(qp);
 		if (!list_empty(list))
-			mod_timer(&dev->mem_timer, jiffies + 1);
+			timer_mod(&dev->mem_timer, jiffies + 1);
 	}
 	spin_unlock_irqrestore(&dev->rdi.pending_lock, flags);
 
@@ -754,7 +754,7 @@ static int wait_kmem(struct qib_ibdev *dev, struct rvt_qp *qp)
 		spin_lock(&dev->rdi.pending_lock);
 		if (list_empty(&priv->iowait)) {
 			if (list_empty(&dev->memwait))
-				mod_timer(&dev->mem_timer, jiffies + 1);
+				timer_mod(&dev->mem_timer, jiffies + 1);
 			qp->s_flags |= RVT_S_WAIT_KMEM;
 			list_add_tail(&priv->iowait, &dev->memwait);
 		}
drivers/infiniband/sw/rxe/rxe_comp.c +2 -2
index a5b2b62f596b..b34a114b07db 100644
@@ -629,7 +629,7 @@ static void reset_retry_timer(struct rxe_qp *qp)
 		spin_lock_irqsave(&qp->state_lock, flags);
 		if (qp_state(qp) >= IB_QPS_RTS &&
 		    psn_compare(qp->req.psn, qp->comp.psn) > 0)
-			mod_timer(&qp->retrans_timer,
+			timer_mod(&qp->retrans_timer,
 				  jiffies + qp->qp_timeout_jiffies);
 		spin_unlock_irqrestore(&qp->state_lock, flags);
 	}
@@ -808,7 +808,7 @@ int rxe_completer(struct rxe_qp *qp)
 				qp->req.wait_for_rnr_timer = 1;
 				rxe_dbg_qp(qp, "set rnr nak timer\n");
 				// TODO who protects from destroy_qp??
-				mod_timer(&qp->rnr_nak_timer,
+				timer_mod(&qp->rnr_nak_timer,
 					  jiffies + rnrnak_jiffies(aeth_syn(pkt)
 						& ~AETH_TYPE_MASK));
 				goto exit;
drivers/infiniband/sw/rxe/rxe_req.c +1 -1
index 373b03f223be..8e70a5c5b346 100644
@@ -586,7 +586,7 @@ static void update_state(struct rxe_qp *qp, struct rxe_pkt_info *pkt)
 	qp->need_req_skb = 0;
 
 	if (qp->qp_timeout_jiffies && !timer_pending(&qp->retrans_timer))
-		mod_timer(&qp->retrans_timer,
+		timer_mod(&qp->retrans_timer,
 			  jiffies + qp->qp_timeout_jiffies);
 }
 
drivers/input/ff-memless.c +1 -1
index 91636479ee3c..70f5b4040f17 100644
@@ -139,7 +139,7 @@ static void ml_schedule_timer(struct ml_device *ml)
 		timer_delete(&ml->timer);
 	} else {
 		pr_debug("timer set\n");
-		mod_timer(&ml->timer, earliest);
+		timer_mod(&ml->timer, earliest);
 	}
 }
 
drivers/input/gameport/gameport.c +2 -2
index a419315b436d..ce72f2c57797 100644
@@ -179,7 +179,7 @@ void gameport_start_polling(struct gameport *gameport)
 	if (!gameport->poll_cnt++) {
 		BUG_ON(!gameport->poll_handler);
 		BUG_ON(!gameport->poll_interval);
-		mod_timer(&gameport->poll_timer, jiffies + msecs_to_jiffies(gameport->poll_interval));
+		timer_mod(&gameport->poll_timer, jiffies + msecs_to_jiffies(gameport->poll_interval));
 	}
 
 	spin_unlock(&gameport->timer_lock);
@@ -203,7 +203,7 @@ static void gameport_run_poll_handler(struct timer_list *t)
 
 	gameport->poll_handler(gameport);
 	if (gameport->poll_cnt)
-		mod_timer(&gameport->poll_timer, jiffies + msecs_to_jiffies(gameport->poll_interval));
+		timer_mod(&gameport->poll_timer, jiffies + msecs_to_jiffies(gameport->poll_interval));
 }
 
 /*
drivers/input/input.c +2 -2
index 44887e51e049..56a9f1e6ce51 100644
@@ -89,7 +89,7 @@ static void input_start_autorepeat(struct input_dev *dev, int code)
 	    dev->rep[REP_PERIOD] && dev->rep[REP_DELAY] &&
 	    dev->timer.function) {
 		dev->repeat_key = code;
-		mod_timer(&dev->timer,
+		timer_mod(&dev->timer,
 			  jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]));
 	}
 }
@@ -2262,7 +2262,7 @@ static void input_repeat_key(struct timer_list *t)
 		input_handle_event(dev, EV_SYN, SYN_REPORT, 1);
 
 		if (dev->rep[REP_PERIOD])
-			mod_timer(&dev->timer, jiffies +
+			timer_mod(&dev->timer, jiffies +
 					msecs_to_jiffies(dev->rep[REP_PERIOD]));
 	}
 }
drivers/input/joystick/db9.c +2 -2
index d5c67a927404..a6fb4c9f3dd1 100644
@@ -498,7 +498,7 @@ static void db9_timer(struct timer_list *t)
 
 	input_sync(dev);
 
-	mod_timer(&db9->timer, jiffies + DB9_REFRESH_TIME);
+	timer_mod(&db9->timer, jiffies + DB9_REFRESH_TIME);
 }
 
 static int db9_open(struct input_dev *dev)
@@ -514,7 +514,7 @@ static int db9_open(struct input_dev *dev)
 				parport_data_reverse(port);
 				parport_write_control(port, DB9_NORMAL);
 			}
-			mod_timer(&db9->timer, jiffies + DB9_REFRESH_TIME);
+			timer_mod(&db9->timer, jiffies + DB9_REFRESH_TIME);
 		}
 
 		return 0;
drivers/input/joystick/gamecon.c +2 -2
index ae95cb3d0ae9..0cf48bc35a16 100644
@@ -759,7 +759,7 @@ static void gc_timer(struct timer_list *t)
 	if (gc->pad_count[GC_PSX] || gc->pad_count[GC_DDR])
 		gc_psx_process_packet(gc);
 
-	mod_timer(&gc->timer, jiffies + GC_REFRESH_TIME);
+	timer_mod(&gc->timer, jiffies + GC_REFRESH_TIME);
 }
 
 static int gc_open(struct input_dev *dev)
@@ -770,7 +770,7 @@ static int gc_open(struct input_dev *dev)
 		if (!gc->used++) {
 			parport_claim(gc->pd);
 			parport_write_control(gc->pd->port, 0x04);
-			mod_timer(&gc->timer, jiffies + GC_REFRESH_TIME);
+			timer_mod(&gc->timer, jiffies + GC_REFRESH_TIME);
 		}
 
 		return 0;
drivers/input/joystick/n64joy.c +2 -2
index 94d2f4e96fe6..b75f19f638db 100644
@@ -185,7 +185,7 @@ static void n64joy_poll(struct timer_list *t)
 		input_sync(dev);
 	}
 
-	mod_timer(&priv->timer, jiffies + msecs_to_jiffies(16));
+	timer_mod(&priv->timer, jiffies + msecs_to_jiffies(16));
 }
 
 static int n64joy_open(struct input_dev *dev)
@@ -199,7 +199,7 @@ static int n64joy_open(struct input_dev *dev)
 			 * if the poll point slightly changes.
 			 */
 			timer_setup(&priv->timer, n64joy_poll, 0);
-			mod_timer(&priv->timer, jiffies + msecs_to_jiffies(16));
+			timer_mod(&priv->timer, jiffies + msecs_to_jiffies(16));
 		}
 
 		priv->n64joy_opened++;
drivers/input/joystick/turbografx.c +2 -2
index 5f69aef01791..1a761596bf14 100644
@@ -97,7 +97,7 @@ static void tgfx_timer(struct timer_list *t)
 			input_sync(dev);
 		}
 
-	mod_timer(&tgfx->timer, jiffies + TGFX_REFRESH_TIME);
+	timer_mod(&tgfx->timer, jiffies + TGFX_REFRESH_TIME);
 }
 
 static int tgfx_open(struct input_dev *dev)
@@ -108,7 +108,7 @@ static int tgfx_open(struct input_dev *dev)
 		if (!tgfx->used++) {
 			parport_claim(tgfx->pd);
 			parport_write_control(tgfx->pd->port, 0x04);
-			mod_timer(&tgfx->timer, jiffies + TGFX_REFRESH_TIME);
+			timer_mod(&tgfx->timer, jiffies + TGFX_REFRESH_TIME);
 		}
 
 		return 0;
drivers/input/keyboard/imx_keypad.c +3 -3
index 69e511a8a605..d92246d11dcc 100644
@@ -223,7 +223,7 @@ static void imx_keypad_check_for_events(struct timer_list *t)
 	 * in the near future.
 	 */
 	if (keypad->stable_count < IMX_KEYPAD_SCANS_FOR_STABILITY) {
-		mod_timer(&keypad->check_matrix_timer,
+		timer_mod(&keypad->check_matrix_timer,
 			  jiffies + msecs_to_jiffies(10));
 		return;
 	}
@@ -271,7 +271,7 @@ static void imx_keypad_check_for_events(struct timer_list *t)
 		 * the KRI interrupt to react quickly to key release
 		 * event.
 		 */
-		mod_timer(&keypad->check_matrix_timer,
+		timer_mod(&keypad->check_matrix_timer,
 			  jiffies + msecs_to_jiffies(60));
 
 		reg_val = readw(keypad->mmio_base + KPSR);
@@ -303,7 +303,7 @@ static irqreturn_t imx_keypad_irq_handler(int irq, void *dev_id)
 		keypad->stable_count = 0;
 
 		/* Schedule the scanning procedure near in the future */
-		mod_timer(&keypad->check_matrix_timer,
+		timer_mod(&keypad->check_matrix_timer,
 			  jiffies + msecs_to_jiffies(2));
 	}
 
drivers/input/keyboard/locomokbd.c +1 -1
index 58d4f2096cf9..0ffe67f587a8 100644
@@ -163,7 +163,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd)
 
 	/* if any keys are pressed, enable the timer */
 	if (num_pressed)
-		mod_timer(&locomokbd->timer, jiffies + SCAN_INTERVAL);
+		timer_mod(&locomokbd->timer, jiffies + SCAN_INTERVAL);
 	else
 		locomokbd->count_cancel = 0;
 }
drivers/input/keyboard/omap-keypad.c +1 -1
index 9e13f3f70a81..42e7793a65e4 100644
@@ -130,7 +130,7 @@ static void omap_kp_tasklet(unsigned long data)
 	if (key_down) {
 		/* some key is pressed - keep irq disabled and use timer
 		 * to poll the keypad */
-		mod_timer(&omap_kp_data->timer, jiffies + HZ / 20);
+		timer_mod(&omap_kp_data->timer, jiffies + HZ / 20);
 	} else {
 		/* enable interrupts */
 		omap_writew(0, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
drivers/input/keyboard/snvs_pwrkey.c +2 -2
index 08a8fbfc43d5..136d7f02edb5 100644
@@ -61,7 +61,7 @@ static void imx_imx_snvs_check_for_events(struct timer_list *t)
 
 	/* repeat check if pressed long */
 	if (state) {
-		mod_timer(&pdata->check_timer,
+		timer_mod(&pdata->check_timer,
 			  jiffies + msecs_to_jiffies(REPEAT_INTERVAL));
 	}
 }
@@ -89,7 +89,7 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)
 			input_sync(input);
 			pm_relax(input->dev.parent);
 		} else {
-			mod_timer(&pdata->check_timer,
+			timer_mod(&pdata->check_timer,
 			          jiffies + msecs_to_jiffies(DEBOUNCE_TIME));
 		}
 	}
drivers/input/keyboard/tegra-kbc.c +2 -2
index bc1c80a456f2..304027d3837b 100644
@@ -257,7 +257,7 @@ static void tegra_kbc_keypress_timer(struct timer_list *t)
 		 * for the repoll delay.
 		 */
 		dly = (val == 1) ? kbc->repoll_dly : 1;
-		mod_timer(&kbc->timer, jiffies + msecs_to_jiffies(dly));
+		timer_mod(&kbc->timer, jiffies + msecs_to_jiffies(dly));
 	} else {
 		/* Release any pressed keys and exit the polling loop */
 		for (i = 0; i < kbc->num_pressed_keys; i++)
@@ -291,7 +291,7 @@ static irqreturn_t tegra_kbc_isr(int irq, void *args)
 		 * the polling loop in tegra_kbc_keypress_timer.
 		 */
 		tegra_kbc_set_fifo_interrupt(kbc, false);
-		mod_timer(&kbc->timer, jiffies + kbc->cp_dly_jiffies);
+		timer_mod(&kbc->timer, jiffies + kbc->cp_dly_jiffies);
 	} else if (val & KBC_INT_KEYPRESS_INT_STATUS) {
 		/* We can be here only through system resume path */
 		kbc->keypress_caused_wake = true;
drivers/input/misc/nxp-bbnsm-pwrkey.c +2 -2
index 0c7b8f8ef4a5..727be14f3283 100644
@@ -63,7 +63,7 @@ static void bbnsm_pwrkey_check_for_events(struct timer_list *t)
 
 	/* repeat check if pressed long */
 	if (state)
-		mod_timer(&bbnsm->check_timer,
+		timer_mod(&bbnsm->check_timer,
 			  jiffies + msecs_to_jiffies(REPEAT_INTERVAL));
 }
 
@@ -92,7 +92,7 @@ static irqreturn_t bbnsm_pwrkey_interrupt(int irq, void *dev_id)
 		bbnsm->suspended = false;
 	}
 
-	mod_timer(&bbnsm->check_timer,
+	timer_mod(&bbnsm->check_timer,
 		   jiffies + msecs_to_jiffies(DEBOUNCE_TIME));
 
 	/* clear PWR OFF */
drivers/input/mouse/alps.c +1 -1
index be734d65ea72..8e61b2dab545 100644
@@ -1515,7 +1515,7 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
 		 * psmouse core times out itself. 20 ms should be enough
 		 * to decide if we are getting more data or not.
 		 */
-		mod_timer(&priv->timer, jiffies + msecs_to_jiffies(20));
+		timer_mod(&priv->timer, jiffies + msecs_to_jiffies(20));
 		return PSMOUSE_GOOD_DATA;
 	}
 
drivers/input/mouse/byd.c +1 -1
index 71aa23dd7d8d..19bbc1c35ae2 100644
@@ -329,7 +329,7 @@ static psmouse_ret_t byd_process_byte(struct psmouse *psmouse)
 	/* Reset time since last touch. */
 	if (priv->touch) {
 		priv->last_touch_time = jiffies;
-		mod_timer(&priv->timer, jiffies + BYD_TOUCH_TIMEOUT);
+		timer_mod(&priv->timer, jiffies + BYD_TOUCH_TIMEOUT);
 	}
 
 	return PSMOUSE_FULL_PACKET;
drivers/input/serio/hil_mlc.c +3 -3
index 94e8bcbbf94d..d64835858263 100644
@@ -745,7 +745,7 @@ static int hilse_donode(hil_mlc *mlc)
 
 		if (time_after(now, mlc->instart + mlc->intimeout))
 			 goto sched;
-		mod_timer(&hil_mlcs_kicker, mlc->instart + mlc->intimeout);
+		timer_mod(&hil_mlcs_kicker, mlc->instart + mlc->intimeout);
 		break;
 	sched:
 		tasklet_schedule(&hil_mlcs_tasklet);
@@ -799,7 +799,7 @@ static void hil_mlcs_timer(struct timer_list *unused)
 	tasklet_schedule(&hil_mlcs_tasklet);
 	/* Re-insert the periodic task. */
 	if (!timer_pending(&hil_mlcs_kicker))
-		mod_timer(&hil_mlcs_kicker, jiffies + HZ);
+		timer_mod(&hil_mlcs_kicker, jiffies + HZ);
 }
 
 /******************** user/kernel context functions **********************/
@@ -1008,7 +1008,7 @@ int hil_mlc_unregister(hil_mlc *mlc)
 static int __init hil_mlc_init(void)
 {
 	timer_setup(&hil_mlcs_kicker, &hil_mlcs_timer, 0);
-	mod_timer(&hil_mlcs_kicker, jiffies + HZ);
+	timer_mod(&hil_mlcs_kicker, jiffies + HZ);
 
 	tasklet_enable(&hil_mlcs_tasklet);
 
drivers/input/serio/hp_sdc.c +1 -1
index 05f6d96e0aa3..b2620d4571c7 100644
@@ -795,7 +795,7 @@ static void hp_sdc_kicker(struct timer_list *unused)
 {
 	tasklet_schedule(&hp_sdc.task);
 	/* Re-insert the periodic task. */
-	mod_timer(&hp_sdc.kicker, jiffies + HZ);
+	timer_mod(&hp_sdc.kicker, jiffies + HZ);
 }
 
 /************************** Module Initialization ***************************/
drivers/input/touchscreen/ad7877.c +1 -1
index c9aa1847265a..d29dbe9276a7 100644
@@ -398,7 +398,7 @@ static irqreturn_t ad7877_irq(int irq, void *handle)
 	spin_lock_irqsave(&ts->lock, flags);
 	error = ad7877_process_data(ts);
 	if (!error)
-		mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
+		timer_mod(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
 	spin_unlock_irqrestore(&ts->lock, flags);
 
 out:
drivers/input/touchscreen/ad7879.c +1 -1
index f9db5cefb25b..9b6917345d41 100644
@@ -253,7 +253,7 @@ static irqreturn_t ad7879_irq(int irq, void *handle)
 		dev_err_ratelimited(ts->dev, "failed to read %#02x: %d\n",
 				    AD7879_REG_XPLUS, error);
 	else if (!ad7879_report(ts))
-		mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
+		timer_mod(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
 
 	return IRQ_HANDLED;
 }
drivers/input/touchscreen/bu21029_ts.c +1 -1
index 1f1157dd3be5..8b8721fb09d3 100644
@@ -234,7 +234,7 @@ static irqreturn_t bu21029_touch_soft_irq(int irq, void *data)
 	bu21029_touch_report(bu21029, buf);
 
 	/* reset timer for pen up detection */
-	mod_timer(&bu21029->timer,
+	timer_mod(&bu21029->timer,
 		  jiffies + msecs_to_jiffies(PEN_UP_TIMEOUT_MS));
 
 out:
drivers/input/touchscreen/exc3000.c +1 -1
index 28da7ba55a4b..884609455bcd 100644
@@ -113,7 +113,7 @@ static void exc3000_timer(struct timer_list *t)
 
 static inline void exc3000_schedule_timer(struct exc3000_data *data)
 {
-	mod_timer(&data->timer, jiffies + msecs_to_jiffies(EXC3000_TIMEOUT_MS));
+	timer_mod(&data->timer, jiffies + msecs_to_jiffies(EXC3000_TIMEOUT_MS));
 }
 
 static void exc3000_shutdown_timer(void *timer)
drivers/input/touchscreen/sx8654.c +1 -1
index 5fa47a1a6fdc..8002311f8d40 100644
@@ -183,7 +183,7 @@ static irqreturn_t sx8650_irq(int irq, void *handle)
 	input_sync(ts->input);
 	dev_dbg(dev, "point(%4d,%4d)\n", x, y);
 
-	mod_timer(&ts->timer, jiffies + SX8650_PENIRQ_TIMEOUT);
+	timer_mod(&ts->timer, jiffies + SX8650_PENIRQ_TIMEOUT);
 	spin_unlock_irqrestore(&ts->lock, flags);
 
 	return IRQ_HANDLED;
drivers/input/touchscreen/tsc200x-core.c +1 -1
index 82d7d1cf5010..8517745e1871 100644
@@ -183,7 +183,7 @@ static irqreturn_t tsc200x_irq_thread(int irq, void *_ts)
 
 	scoped_guard(spinlock_irqsave, &ts->lock) {
 		tsc200x_update_pen_state(ts, tsdata.x, tsdata.y, pressure);
-		mod_timer(&ts->penup_timer,
+		timer_mod(&ts->penup_timer,
 			  jiffies + msecs_to_jiffies(TSC200X_PENUP_TIME_MS));
 	}
 
drivers/iommu/dma-iommu.c +1 -1
index d4352f13c172..86f8983a4db6 100644
@@ -238,7 +238,7 @@ static void queue_iova(struct iommu_dma_cookie *cookie,
 	/* Avoid false sharing as much as possible. */
 	if (!atomic_read(&cookie->fq_timer_on) &&
 	    !atomic_xchg(&cookie->fq_timer_on, 1))
-		mod_timer(&cookie->fq_timer,
+		timer_mod(&cookie->fq_timer,
 			  jiffies + msecs_to_jiffies(cookie->options.fq_timeout));
 }
 
drivers/isdn/mISDN/l1oip_core.c +2 -2
index 76da7c5b4049..d0d281a8ab1c 100644
@@ -277,7 +277,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
 
 	/* restart timer */
 	if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ) && !hc->shutdown)
-		mod_timer(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ);
+		timer_mod(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ);
 	else
 		hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ;
 
@@ -606,7 +606,7 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len)
 	     !hc->timeout_on) &&
 	    !hc->shutdown) {
 		hc->timeout_on = 1;
-		mod_timer(&hc->timeout_tl, jiffies + L1OIP_TIMEOUT * HZ);
+		timer_mod(&hc->timeout_tl, jiffies + L1OIP_TIMEOUT * HZ);
 	} else /* only adjust timer */
 		hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ;
 
drivers/leds/flash/leds-rt8515.c +1 -1
index 6af0d2c7fc56..70b0e721854a 100644
@@ -124,7 +124,7 @@ static int rt8515_led_flash_strobe_set(struct led_classdev_flash *fled,
 		/* Enable LED flash mode and set brightness */
 		rt8515_gpio_brightness_commit(rt->enable_flash, brightness);
 		/* Set timeout */
-		mod_timer(&rt->powerdown_timer,
+		timer_mod(&rt->powerdown_timer,
 			  jiffies + usecs_to_jiffies(timeout->val));
 	} else {
 		timer_delete_sync(&rt->powerdown_timer);
drivers/leds/flash/leds-sgm3140.c +1 -1
index 3e83200675f2..78d49c36569c 100644
@@ -52,7 +52,7 @@ static int sgm3140_strobe_set(struct led_classdev_flash *fled_cdev, bool state)
 		}
 		gpiod_set_value_cansleep(priv->flash_gpio, 1);
 		gpiod_set_value_cansleep(priv->enable_gpio, 1);
-		mod_timer(&priv->powerdown_timer,
+		timer_mod(&priv->powerdown_timer,
 			  jiffies + usecs_to_jiffies(priv->timeout));
 	} else {
 		timer_delete_sync(&priv->powerdown_timer);
drivers/leds/led-core.c +2 -2
index bd451c77ce4d..33eb2313c0a0 100644
@@ -116,7 +116,7 @@ static void led_timer_function(struct timer_list *t)
 		}
 	}
 
-	mod_timer(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay));
+	timer_mod(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay));
 }
 
 static void set_brightness_delayed_set_brightness(struct led_classdev *led_cdev,
@@ -213,7 +213,7 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
 	}
 
 	set_bit(LED_BLINK_SW, &led_cdev->work_flags);
-	mod_timer(&led_cdev->blink_timer, jiffies + 1);
+	timer_mod(&led_cdev->blink_timer, jiffies + 1);
 }
 
 
drivers/leds/trigger/ledtrig-activity.c +1 -1
index 1bccaef5eddf..b220e234aa2a 100644
@@ -148,7 +148,7 @@ static void led_activity_function(struct timer_list *t)
 		activity_data->time_left = delay;
 
 	delay = min_t(int, activity_data->time_left, 100);
-	mod_timer(&activity_data->timer, jiffies + msecs_to_jiffies(delay));
+	timer_mod(&activity_data->timer, jiffies + msecs_to_jiffies(delay));
 }
 
 static ssize_t led_invert_show(struct device *dev,
drivers/leds/trigger/ledtrig-heartbeat.c +1 -1
index 40eb61b6d54e..bc4b9f27abc1 100644
@@ -88,7 +88,7 @@ static void led_heartbeat_function(struct timer_list *t)
 	}
 
 	led_set_brightness_nosleep(led_cdev, brightness);
-	mod_timer(&heartbeat_data->timer, jiffies + delay);
+	timer_mod(&heartbeat_data->timer, jiffies + delay);
 }
 
 static ssize_t led_invert_show(struct device *dev,
drivers/leds/trigger/ledtrig-pattern.c +1 -1
index 1aac5e087242..9192f9d4eb52 100644
@@ -103,7 +103,7 @@ static void pattern_trig_timer_restart(struct pattern_trig_data *data,
 	if (data->type == PATTERN_TYPE_HR)
 		hrtimer_forward_now(&data->hrtimer, ms_to_ktime(interval));
 	else
-		mod_timer(&data->timer, jiffies + msecs_to_jiffies(interval));
+		timer_mod(&data->timer, jiffies + msecs_to_jiffies(interval));
 }
 
 static void pattern_trig_timer_common_function(struct pattern_trig_data *data)
drivers/leds/trigger/ledtrig-transient.c +1 -1
index 20f1351464b1..9b4fb5caf42f 100644
@@ -80,7 +80,7 @@ static ssize_t transient_activate_store(struct device *dev,
 		led_set_brightness_nosleep(led_cdev, transient_data->state);
 		transient_data->restore_state =
 		    (transient_data->state == LED_FULL) ? LED_OFF : LED_FULL;
-		mod_timer(&transient_data->timer,
+		timer_mod(&transient_data->timer,
 			  jiffies + msecs_to_jiffies(transient_data->duration));
 	}
 
drivers/macintosh/smu.c +1 -1
index a1534cc6c641..6346f1562202 100644
@@ -792,7 +792,7 @@ static void smu_i2c_low_completion(struct smu_cmd *scmd, void *misc)
 			smu_i2c_retry(NULL);
 			return;
 		}
-		mod_timer(&smu->i2c_timer, jiffies + msecs_to_jiffies(5));
+		timer_mod(&smu->i2c_timer, jiffies + msecs_to_jiffies(5));
 		return;
 	}
 
drivers/mailbox/mailbox-altera.c +2 -2
index 17278c2571d3..6c1734032ddf 100644
@@ -134,7 +134,7 @@ static void altera_mbox_poll_rx(struct timer_list *t)
 
 	altera_mbox_rx_data(mbox->chan);
 
-	mod_timer(&mbox->rxpoll_timer,
+	timer_mod(&mbox->rxpoll_timer,
 		  jiffies + msecs_to_jiffies(MBOX_POLLING_MS));
 }
 
@@ -197,7 +197,7 @@ static int altera_mbox_startup_receiver(struct mbox_chan *chan)
 	/* Setup polling timer */
 	mbox->chan = chan;
 	timer_setup(&mbox->rxpoll_timer, altera_mbox_poll_rx, 0);
-	mod_timer(&mbox->rxpoll_timer,
+	timer_mod(&mbox->rxpoll_timer,
 		  jiffies + msecs_to_jiffies(MBOX_POLLING_MS));
 
 	return 0;
drivers/md/dm-integrity.c +1 -1
index e90cfcef96f4..f61571238df2 100644
@@ -1549,7 +1549,7 @@ static void autocommit_fn(struct timer_list *t)
 static void schedule_autocommit(struct dm_integrity_c *ic)
 {
 	if (!timer_pending(&ic->autocommit_timer))
-		mod_timer(&ic->autocommit_timer, jiffies + ic->autocommit_jiffies);
+		timer_mod(&ic->autocommit_timer, jiffies + ic->autocommit_jiffies);
 }
 
 static void submit_flush_bio(struct dm_integrity_c *ic, struct dm_integrity_io *dio)
drivers/md/dm-mpath.c +1 -1
index ff55a5e4f5c9..356771634ef3 100644
@@ -808,7 +808,7 @@ static void enable_nopath_timeout(struct multipath *m)
 	if (queue_if_no_path_timeout > 0 &&
 	    atomic_read(&m->nr_valid_paths) == 0 &&
 	    test_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags)) {
-		mod_timer(&m->nopath_timer,
+		timer_mod(&m->nopath_timer,
 			  jiffies + queue_if_no_path_timeout);
 	}
 }
drivers/md/dm-vdo/dedupe.c +1 -1
index 4d983092a152..4499e6686b70 100644
@@ -2140,7 +2140,7 @@ static void start_expiration_timer(struct dedupe_context *context)
 
 	end_time = max(start_time + vdo_dedupe_index_timeout_jiffies,
 		       jiffies + vdo_dedupe_index_min_timer_jiffies);
-	mod_timer(&context->zone->timer, end_time);
+	timer_mod(&context->zone->timer, end_time);
 }
 
 /**
drivers/md/dm-writecache.c +3 -3
index a428e1cacf07..6c30614ed5d0 100644
@@ -710,7 +710,7 @@ static void writecache_max_age_timer(struct timer_list *t)
 
 	if (!dm_suspended(wc->ti) && !writecache_has_error(wc)) {
 		queue_work(wc->writeback_wq, &wc->writeback_work);
-		mod_timer(&wc->max_age_timer, jiffies + wc->max_age / MAX_AGE_DIV);
+		timer_mod(&wc->max_age_timer, jiffies + wc->max_age / MAX_AGE_DIV);
 	}
 }
 
@@ -875,7 +875,7 @@ static void writecache_autocommit_timer(struct timer_list *t)
 static void writecache_schedule_autocommit(struct dm_writecache *wc)
 {
 	if (!timer_pending(&wc->autocommit_timer))
-		mod_timer(&wc->autocommit_timer, jiffies + wc->autocommit_jiffies);
+		timer_mod(&wc->autocommit_timer, jiffies + wc->autocommit_jiffies);
 }
 
 static void writecache_discard(struct dm_writecache *wc, sector_t start, sector_t end)
@@ -1104,7 +1104,7 @@ static void writecache_resume(struct dm_target *ti)
 	writecache_verify_watermark(wc);
 
 	if (wc->max_age != MAX_AGE_UNSPECIFIED)
-		mod_timer(&wc->max_age_timer, jiffies + wc->max_age / MAX_AGE_DIV);
+		timer_mod(&wc->max_age_timer, jiffies + wc->max_age / MAX_AGE_DIV);
 
 	wc_unlock(wc);
 }
drivers/md/md.c +2 -2
index b4a845e29f28..351f5896acd8 100644
@@ -3856,7 +3856,7 @@ safe_delay_store(struct mddev *mddev, const char *cbuf, size_t len)
 			new_delay = 1;
 		mddev->safemode_delay = new_delay;
 		if (new_delay < old_delay || old_delay == 0)
-			mod_timer(&mddev->safemode_timer, jiffies+1);
+			timer_mod(&mddev->safemode_timer, jiffies+1);
 	}
 	return len;
 }
@@ -8710,7 +8710,7 @@ void md_write_end(struct mddev *mddev)
 		/* The roundup() ensures this only performs locking once
 		 * every ->safemode_delay jiffies
 		 */
-		mod_timer(&mddev->safemode_timer,
+		timer_mod(&mddev->safemode_timer,
 			  roundup(jiffies, mddev->safemode_delay) +
 			  mddev->safemode_delay);
 }
drivers/media/common/saa7146/saa7146_vbi.c +1 -1
index 1ffcc025d1a4..efd3dfdcefdf 100644
@@ -211,7 +211,7 @@ static int buffer_activate(struct saa7146_dev *dev,
 	DEB_VBI("dev:%p, buf:%p, next:%p\n", dev, buf, next);
 	saa7146_set_vbi_capture(dev,buf,next);
 
-	mod_timer(&vv->vbi_dmaq.timeout, jiffies+BUFFER_TIMEOUT);
+	timer_mod(&vv->vbi_dmaq.timeout, jiffies+BUFFER_TIMEOUT);
 	return 0;
 }
 
drivers/media/common/saa7146/saa7146_video.c +1 -1
index 733e18001d0d..2ce6e3f3a759 100644
@@ -542,7 +542,7 @@ static int buffer_activate (struct saa7146_dev *dev,
 
 	saa7146_set_capture(dev,buf,next);
 
-	mod_timer(&vv->video_dmaq.timeout, jiffies+BUFFER_TIMEOUT);
+	timer_mod(&vv->video_dmaq.timeout, jiffies+BUFFER_TIMEOUT);
 	return 0;
 }
 
drivers/media/i2c/tc358743.c +1 -1
index 4281f47f217b..f1608e62a63a 100644
@@ -1510,7 +1510,7 @@ static void tc358743_irq_poll_timer(struct timer_list *t)
 	 * otherwise we will miss CEC messages.
 	 */
 	msecs = state->cec_adap ? POLL_INTERVAL_CEC_MS : POLL_INTERVAL_MS;
-	mod_timer(&state->timer, jiffies + msecs_to_jiffies(msecs));
+	timer_mod(&state->timer, jiffies + msecs_to_jiffies(msecs));
 }
 
 static void tc358743_work_i2c_poll(struct work_struct *work)
drivers/media/i2c/tvaudio.c +2 -2
index 6267e9ad39c0..7c7995635b17 100644
@@ -383,7 +383,7 @@ static int chip_thread(void *data)
 		desc->setaudmode(chip, selected);
 
 		/* schedule next check */
-		mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000));
+		timer_mod(&chip->wt, jiffies+msecs_to_jiffies(2000));
 	}
 
 	v4l2_dbg(1, debug, sd, "thread exiting\n");
@@ -1882,7 +1882,7 @@ static int tvaudio_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequen
 	if (chip->thread) {
 		desc->setaudmode(chip, V4L2_TUNER_MODE_MONO);
 		chip->prevmode = -1; /* reset previous mode */
-		mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000));
+		timer_mod(&chip->wt, jiffies+msecs_to_jiffies(2000));
 	}
 	return 0;
 }
drivers/media/pci/bt8xx/bttv-input.c +2 -2
index cbb80a0b491e..90f54f2d9cf1 100644
@@ -133,7 +133,7 @@ static void bttv_input_timer(struct timer_list *t)
 		ir_enltv_handle_key(btv);
 	else
 		ir_handle_key(btv);
-	mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
+	timer_mod(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
 /*
@@ -276,7 +276,7 @@ static int bttv_rc5_irq(struct bttv *btv)
 		ir->base_time = tv;
 		ir->last_bit = 0;
 
-		mod_timer(&ir->timer, current_jiffies + msecs_to_jiffies(30));
+		timer_mod(&ir->timer, current_jiffies + msecs_to_jiffies(30));
 	}
 
 	/* toggle GPIO pin 4 to reset the irq */
drivers/media/pci/bt8xx/bttv-risc.c +1 -1
index 79581cd7bd59..45bdd5a8a425 100644
@@ -374,7 +374,7 @@ static void bttv_set_risc_status(struct bttv *btv)
 static void bttv_set_irq_timer(struct bttv *btv)
 {
 	if (btv->curr.frame_irq || btv->loop_irq || btv->cvbi)
-		mod_timer(&btv->timeout, jiffies + BTTV_TIMEOUT);
+		timer_mod(&btv->timeout, jiffies + BTTV_TIMEOUT);
 	else
 		timer_delete(&btv->timeout);
 }
drivers/media/pci/cx18/cx18-mailbox.c +1 -1
index a6457c23d18c..1e22f6c8b940 100644
@@ -195,7 +195,7 @@ static void cx18_mdl_send_to_vb2(struct cx18_stream *s, struct cx18_mdl *mdl)
 		vb2_buffer_done(&vb_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 	}
 
-	mod_timer(&s->vb_timeout, msecs_to_jiffies(2000) + jiffies);
+	timer_mod(&s->vb_timeout, msecs_to_jiffies(2000) + jiffies);
 
 out:
 	spin_unlock(&s->vb_lock);
drivers/media/pci/cx18/cx18-streams.c +1 -1
index 42d6f7b90ede..d191fc0e5e22 100644
@@ -200,7 +200,7 @@ static int cx18_start_streaming(struct vb2_queue *vq, unsigned int count)
 	rc = cx18_start_capture(fh2id(owner));
 	if (!rc) {
 		/* Establish a buffer timeout */
-		mod_timer(&s->vb_timeout, msecs_to_jiffies(2000) + jiffies);
+		timer_mod(&s->vb_timeout, msecs_to_jiffies(2000) + jiffies);
 		return 0;
 	}
 
drivers/media/pci/netup_unidvb/netup_unidvb_core.c +1 -1
index 9f2ac33cffa7..f64cd5e4fd09 100644
@@ -330,7 +330,7 @@ static void netup_unidvb_buf_queue(struct vb2_buffer *vb)
 	spin_lock_irqsave(&dma->lock, flags);
 	list_add_tail(&buf->list, &dma->free_buffers);
 	spin_unlock_irqrestore(&dma->lock, flags);
-	mod_timer(&dma->timeout, jiffies + msecs_to_jiffies(1000));
+	timer_mod(&dma->timeout, jiffies + msecs_to_jiffies(1000));
 }
 
 static int netup_unidvb_start_streaming(struct vb2_queue *q, unsigned int count)
drivers/media/pci/saa7134/saa7134-input.c +1 -1
index a0bf76e3f8af..88f80fe7c688 100644
@@ -435,7 +435,7 @@ static void saa7134_input_timer(struct timer_list *t)
 	struct saa7134_dev *dev = ir->dev->priv;
 
 	build_key(dev);
-	mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
+	timer_mod(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
 int saa7134_ir_open(struct rc_dev *rc)
drivers/media/pci/saa7134/saa7134-ts.c +1 -1
index 1b44033067c5..06ba7cad74e3 100644
@@ -56,7 +56,7 @@ static int buffer_activate(struct saa7134_dev *dev,
 	/* start DMA */
 	saa7134_set_dmabits(dev);
 
-	mod_timer(&dev->ts_q.timeout, jiffies+TS_BUFFER_TIMEOUT);
+	timer_mod(&dev->ts_q.timeout, jiffies+TS_BUFFER_TIMEOUT);
 
 	if (!dev->ts_started)
 		saa7134_ts_start(dev);
drivers/media/pci/saa7134/saa7134-vbi.c +1 -1
index 28bf77449bdb..b97142cc777e 100644
@@ -97,7 +97,7 @@ static int buffer_activate(struct saa7134_dev *dev,
 
 	/* start DMA */
 	saa7134_set_dmabits(dev);
-	mod_timer(&dmaq->timeout, jiffies + BUFFER_TIMEOUT);
+	timer_mod(&dmaq->timeout, jiffies + BUFFER_TIMEOUT);
 
 	return 0;
 }
drivers/media/pci/saa7134/saa7134-video.c +1 -1
index c88939bce56b..1421b95ba166 100644
@@ -708,7 +708,7 @@ static int buffer_activate(struct saa7134_dev *dev,
 
 	/* start DMA */
 	saa7134_set_dmabits(dev);
-	mod_timer(&dmaq->timeout, jiffies + BUFFER_TIMEOUT);
+	timer_mod(&dmaq->timeout, jiffies + BUFFER_TIMEOUT);
 	return 0;
 }
 
drivers/media/pci/tw686x/tw686x-audio.c +1 -1
index 1ae3845b6743..4dfdb58f641a 100644
@@ -224,7 +224,7 @@ static int tw686x_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
 				AUDIO_CHANNEL_OFFSET + ac->ch);
 			spin_unlock_irqrestore(&dev->lock, flags);
 
-			mod_timer(&dev->dma_delay_timer,
+			timer_mod(&dev->dma_delay_timer,
 				  jiffies + msecs_to_jiffies(100));
 		} else {
 			err = -EIO;
drivers/media/pci/tw686x/tw686x-core.c +1 -1
index f39e0e34deb6..9eb3cfa03ebd 100644
@@ -214,7 +214,7 @@ static irqreturn_t tw686x_irq(int irq, void *dev_id)
 		spin_lock_irqsave(&dev->lock, flags);
 		tw686x_reset_channels(dev, reset_ch);
 		spin_unlock_irqrestore(&dev->lock, flags);
-		mod_timer(&dev->dma_delay_timer,
+		timer_mod(&dev->dma_delay_timer,
 			  jiffies + msecs_to_jiffies(100));
 	}
 
drivers/media/pci/tw686x/tw686x-video.c +1 -1
index 785dd797d921..010ec4e057c7 100644
@@ -531,7 +531,7 @@ static int tw686x_start_streaming(struct vb2_queue *vq, unsigned int count)
 	tw686x_enable_channel(dev, vc->ch);
 	spin_unlock_irqrestore(&dev->lock, flags);
 
-	mod_timer(&dev->dma_delay_timer, jiffies + msecs_to_jiffies(100));
+	timer_mod(&dev->dma_delay_timer, jiffies + msecs_to_jiffies(100));
 
 	return 0;
 
drivers/media/rc/ene_ir.c +1 -1
index d6c54a3bccc2..b07f7e61a56c 100644
@@ -653,7 +653,7 @@ static void ene_tx_sample(struct ene_device *dev)
 exit:
 	/* simulate TX done interrupt */
 	if (txsim)
-		mod_timer(&dev->tx_sim_timer, jiffies + HZ / 500);
+		timer_mod(&dev->tx_sim_timer, jiffies + HZ / 500);
 }
 
 /* timer to simulate tx done interrupt */
drivers/media/rc/igorplugusb.c +1 -1
index e034c93d57cf..2f687f800050 100644
@@ -104,7 +104,7 @@ static void igorplugusb_callback(struct urb *urb)
 					urb->actual_length > HEADERLEN)
 			igorplugusb_irdata(ir, urb->actual_length);
 		else /* request IR */
-			mod_timer(&ir->timer, jiffies + msecs_to_jiffies(50));
+			timer_mod(&ir->timer, jiffies + msecs_to_jiffies(50));
 		break;
 	case -EPROTO:
 	case -ECONNRESET:
drivers/media/rc/img-ir/img-ir-hw.c +2 -2
index 426b3f21cbad..2c67fea98e70 100644
@@ -857,7 +857,7 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw)
 
 		/* update timer, but allowing for 1/8th tolerance */
 		interval = dec->repeat + (dec->repeat >> 3);
-		mod_timer(&hw->end_timer,
+		timer_mod(&hw->end_timer,
 			  jiffies + msecs_to_jiffies(interval));
 	}
 }
@@ -983,7 +983,7 @@ void img_ir_isr_hw(struct img_ir_priv *priv, u32 irq_status)
 			     hw->quirk_suspend_irq & IMG_IR_IRQ_EDGE);
 
 		/* Timer activated to re-enable the protocol. */
-		mod_timer(&hw->suspend_timer,
+		timer_mod(&hw->suspend_timer,
 			  jiffies + msecs_to_jiffies(5));
 		return;
 	}
drivers/media/rc/img-ir/img-ir-raw.c +1 -1
index 92fb7b555a0f..410e95bb6b09 100644
@@ -54,7 +54,7 @@ void img_ir_isr_raw(struct img_ir_priv *priv, u32 irq_status)
 	img_ir_refresh_raw(priv, irq_status);
 
 	/* start / push back the echo timer */
-	mod_timer(&raw->timer, jiffies + msecs_to_jiffies(ECHO_TIMEOUT_MS));
+	timer_mod(&raw->timer, jiffies + msecs_to_jiffies(ECHO_TIMEOUT_MS));
 }
 
 /*
drivers/media/rc/imon.c +1 -1
index f5221b018808..78dba6745250 100644
@@ -1375,7 +1375,7 @@ static bool imon_mouse_event(struct imon_context *ictx,
 
 static void imon_touch_event(struct imon_context *ictx, unsigned char *buf)
 {
-	mod_timer(&ictx->ttimer, jiffies + TOUCH_TIMEOUT);
+	timer_mod(&ictx->ttimer, jiffies + TOUCH_TIMEOUT);
 	ictx->touch_x = (buf[0] << 4) | (buf[1] >> 4);
 	ictx->touch_y = 0xfff - ((buf[2] << 4) | (buf[1] & 0xf));
 	input_report_abs(ictx->touch, ABS_X, ictx->touch_x);
drivers/media/rc/ir-mce_kbd-decoder.c +1 -1
index f19da3231cc4..2c0ff4ccb6a2 100644
@@ -322,7 +322,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
 			if (scancode) {
 				delay = usecs_to_jiffies(dev->timeout) +
 					msecs_to_jiffies(100);
-				mod_timer(&data->rx_timeout, jiffies + delay);
+				timer_mod(&data->rx_timeout, jiffies + delay);
 			} else {
 				timer_delete(&data->rx_timeout);
 			}
drivers/media/rc/rc-ir-raw.c +2 -2
index 7f4a17efc985..d250cd08493a 100644
@@ -143,7 +143,7 @@ int ir_raw_event_store_with_timeout(struct rc_dev *dev, struct ir_raw_event *ev)
 	if (!timer_pending(&dev->raw->edge_handle) ||
 	    time_after(dev->raw->edge_handle.expires,
 		       jiffies + msecs_to_jiffies(15))) {
-		mod_timer(&dev->raw->edge_handle,
+		timer_mod(&dev->raw->edge_handle,
 			  jiffies + msecs_to_jiffies(15));
 	}
 	spin_unlock(&dev->raw->edge_spinlock);
@@ -567,7 +567,7 @@ static void ir_raw_edge_handle(struct timer_list *t)
 
 		ir_raw_event_store(dev, &ev);
 	} else {
-		mod_timer(&dev->raw->edge_handle,
+		timer_mod(&dev->raw->edge_handle,
 			  jiffies + usecs_to_jiffies(dev->timeout -
 						     ktime_to_us(interval)));
 	}
drivers/media/rc/rc-main.c +4 -4
index b9bf5cdcde4a..9bd267690f9b 100644
@@ -712,7 +712,7 @@ static void ir_timer_repeat(struct timer_list *t)
 		input_event(input, EV_KEY, dev->last_keycode, 2);
 		input_sync(input);
 		if (input->rep[REP_PERIOD])
-			mod_timer(&dev->timer_repeat, jiffies +
+			timer_mod(&dev->timer_repeat, jiffies +
 				  msecs_to_jiffies(input->rep[REP_PERIOD]));
 	}
 	spin_unlock_irqrestore(&dev->keylock, flags);
@@ -759,7 +759,7 @@ void rc_repeat(struct rc_dev *dev)
 
 	if (dev->keypressed) {
 		dev->keyup_jiffies = jiffies + timeout;
-		mod_timer(&dev->timer_keyup, dev->keyup_jiffies);
+		timer_mod(&dev->timer_keyup, dev->keyup_jiffies);
 	}
 
 	spin_unlock_irqrestore(&dev->keylock, flags);
@@ -828,7 +828,7 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_proto protocol,
 	    dev->input_dev->rep[REP_PERIOD] &&
 	    !dev->input_dev->rep[REP_DELAY]) {
 		input_event(dev->input_dev, EV_KEY, keycode, 2);
-		mod_timer(&dev->timer_repeat, jiffies +
+		timer_mod(&dev->timer_repeat, jiffies +
 			  msecs_to_jiffies(dev->input_dev->rep[REP_PERIOD]));
 	}
 
@@ -858,7 +858,7 @@ void rc_keydown(struct rc_dev *dev, enum rc_proto protocol, u64 scancode,
 	if (dev->keypressed) {
 		dev->keyup_jiffies = jiffies + usecs_to_jiffies(dev->timeout) +
 			msecs_to_jiffies(repeat_period(protocol));
-		mod_timer(&dev->timer_keyup, dev->keyup_jiffies);
+		timer_mod(&dev->timer_keyup, dev->keyup_jiffies);
 	}
 	spin_unlock_irqrestore(&dev->keylock, flags);
 }
drivers/media/rc/serial_ir.c +1 -1
index 992fff82b524..cb5e23d161e1 100644
@@ -385,7 +385,7 @@ static irqreturn_t serial_ir_irq_handler(int i, void *blah)
 		}
 	} while (!(sinp(UART_IIR) & UART_IIR_NO_INT)); /* still pending ? */
 
-	mod_timer(&serial_ir.timeout_timer,
+	timer_mod(&serial_ir.timeout_timer,
 		  jiffies + usecs_to_jiffies(serial_ir.rcdev->timeout));
 
 	ir_raw_event_handle(serial_ir.rcdev);
drivers/media/usb/au0828/au0828-dvb.c +1 -1
index 5d0447ff7d06..0f2ff73c878e 100644
@@ -245,7 +245,7 @@ static int start_urb_transfer(struct au0828_dev *dev)
 	dev->urb_streaming = true;
 
 	/* If we don't valid data within 1 second, restart stream */
-	mod_timer(&dev->bulk_timeout, jiffies + (HZ));
+	timer_mod(&dev->bulk_timeout, jiffies + (HZ));
 	dev->bulk_timeout_running = 1;
 
 	return 0;
drivers/media/usb/au0828/au0828-video.c +8 -8
index e5dff969ed57..53eb91183e49 100644
@@ -573,10 +573,10 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
 				/* As long as isoc traffic is arriving, keep
 				   resetting the timer */
 				if (dev->vid_timeout_running)
-					mod_timer(&dev->vid_timeout,
+					timer_mod(&dev->vid_timeout,
 						  jiffies + (HZ / 10));
 				if (dev->vbi_timeout_running)
-					mod_timer(&dev->vbi_timeout,
+					timer_mod(&dev->vbi_timeout,
 						  jiffies + (HZ / 10));
 			}
 
@@ -833,10 +833,10 @@ int au0828_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
 
 		if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
 			dev->vid_timeout_running = 1;
-			mod_timer(&dev->vid_timeout, jiffies + (HZ / 10));
+			timer_mod(&dev->vid_timeout, jiffies + (HZ / 10));
 		} else if (vq->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
 			dev->vbi_timeout_running = 1;
-			mod_timer(&dev->vbi_timeout, jiffies + (HZ / 10));
+			timer_mod(&dev->vbi_timeout, jiffies + (HZ / 10));
 		}
 	}
 	dev->streaming_users++;
@@ -965,7 +965,7 @@ static void au0828_vid_buffer_timeout(struct timer_list *t)
 	get_next_buf(dma_q, &buf);
 
 	if (dev->vid_timeout_running == 1)
-		mod_timer(&dev->vid_timeout, jiffies + (HZ / 10));
+		timer_mod(&dev->vid_timeout, jiffies + (HZ / 10));
 
 	spin_unlock_irqrestore(&dev->slock, flags);
 }
@@ -989,7 +989,7 @@ static void au0828_vbi_buffer_timeout(struct timer_list *t)
 	vbi_get_next_buf(dma_q, &buf);
 
 	if (dev->vbi_timeout_running == 1)
-		mod_timer(&dev->vbi_timeout, jiffies + (HZ / 10));
+		timer_mod(&dev->vbi_timeout, jiffies + (HZ / 10));
 	spin_unlock_irqrestore(&dev->slock, flags);
 }
 
@@ -1711,9 +1711,9 @@ void au0828_v4l2_resume(struct au0828_dev *dev)
 	}
 
 	if (dev->vid_timeout_running)
-		mod_timer(&dev->vid_timeout, jiffies + (HZ / 10));
+		timer_mod(&dev->vid_timeout, jiffies + (HZ / 10));
 	if (dev->vbi_timeout_running)
-		mod_timer(&dev->vbi_timeout, jiffies + (HZ / 10));
+		timer_mod(&dev->vbi_timeout, jiffies + (HZ / 10));
 
 	/* If we were doing ac97 instead of i2s, it would go here...*/
 	au0828_i2s_init(dev);
drivers/media/usb/s2255/s2255drv.c +1 -1
index 8332f2c5aed7..7f29fdcf2c76 100644
@@ -2191,7 +2191,7 @@ static void s2255_fwload_start(struct s2255_dev *dev)
 			  dev->fw_data->pfw_data,
 			  CHUNK_SIZE, s2255_fwchunk_complete,
 			  dev->fw_data);
-	mod_timer(&dev->timer, jiffies + HZ);
+	timer_mod(&dev->timer, jiffies + HZ);
 }
 
 /* standard usb probe function */
drivers/memory/tegra/tegra210-emc-core.c +4 -4
index f12be641959a..ae00a0fd5935 100644
@@ -571,13 +571,13 @@ static void tegra210_emc_train(struct timer_list *timer)
 
 	spin_unlock_irqrestore(&emc->lock, flags);
 
-	mod_timer(&emc->training,
+	timer_mod(&emc->training,
 		  jiffies + msecs_to_jiffies(emc->training_interval));
 }
 
 static void tegra210_emc_training_start(struct tegra210_emc *emc)
 {
-	mod_timer(&emc->training,
+	timer_mod(&emc->training,
 		  jiffies + msecs_to_jiffies(emc->training_interval));
 }
 
@@ -659,7 +659,7 @@ static void tegra210_emc_poll_refresh(struct timer_list *timer)
 		unsigned int interval = emc->refresh_poll_interval;
 		unsigned int timeout = msecs_to_jiffies(interval);
 
-		mod_timer(&emc->refresh_timer, jiffies + timeout);
+		timer_mod(&emc->refresh_timer, jiffies + timeout);
 	}
 }
 
@@ -673,7 +673,7 @@ static void tegra210_emc_poll_refresh_start(struct tegra210_emc *emc)
 {
 	atomic_set(&emc->refresh_poll, 1);
 
-	mod_timer(&emc->refresh_timer,
+	timer_mod(&emc->refresh_timer,
 		  jiffies + msecs_to_jiffies(emc->refresh_poll_interval));
 }
 
drivers/memstick/core/ms_block.c +1 -1
index d34892782f6e..002002cd217e 100644
@@ -1628,7 +1628,7 @@ static int msb_cache_write(struct msb_data *msb, int lba,
 
 	if (msb->cache_block_lba  == MS_BLOCK_INVALID) {
 		msb->cache_block_lba  = lba;
-		mod_timer(&msb->cache_flush_timer,
+		timer_mod(&msb->cache_flush_timer,
 			jiffies + msecs_to_jiffies(cache_flush_timeout));
 	}
 
drivers/memstick/host/jmb38x_ms.c +1 -1
index cddddb3a5a27..fea13120a0a2 100644
@@ -452,7 +452,7 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
 		}
 	}
 
-	mod_timer(&host->timer, jiffies + host->timeout_jiffies);
+	timer_mod(&host->timer, jiffies + host->timeout_jiffies);
 	writel(HOST_CONTROL_LED | readl(host->addr + HOST_CONTROL),
 	       host->addr + HOST_CONTROL);
 	host->req->error = 0;
drivers/memstick/host/r592.c +1 -1
index 605b2265536f..2a4cfbb4b479 100644
@@ -651,7 +651,7 @@ static irqreturn_t r592_irq(int irq, void *data)
 
 		message("IRQ: card %s", card_was_added ? "added" : "removed");
 
-		mod_timer(&dev->detect_timer,
+		timer_mod(&dev->detect_timer,
 			jiffies + msecs_to_jiffies(card_was_added ? 500 : 50));
 	}
 
drivers/memstick/host/tifm_ms.c +1 -1
index db7f3a088fb0..3c0e1832c804 100644
@@ -308,7 +308,7 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)
 		       sock->addr + SOCK_DMA_FIFO_INT_ENABLE_SET);
 	}
 
-	mod_timer(&host->timer, jiffies + host->timeout_jiffies);
+	timer_mod(&host->timer, jiffies + host->timeout_jiffies);
 	writel(TIFM_CTRL_LED | readl(sock->addr + SOCK_CONTROL),
 	       sock->addr + SOCK_CONTROL);
 	host->req->error = 0;
drivers/misc/bcm-vk/bcm_vk_tty.c +2 -2
index e6c42b772e96..7fd00da74590 100644
@@ -46,7 +46,7 @@ static void bcm_vk_tty_poll(struct timer_list *t)
 	struct bcm_vk *vk = timer_container_of(vk, t, serial_timer);
 
 	queue_work(vk->tty_wq_thread, &vk->tty_wq_work);
-	mod_timer(&vk->serial_timer, jiffies + SERIAL_TIMER_VALUE);
+	timer_mod(&vk->serial_timer, jiffies + SERIAL_TIMER_VALUE);
 }
 
 irqreturn_t bcm_vk_tty_irqhandler(int irq, void *dev_id)
@@ -162,7 +162,7 @@ static int bcm_vk_tty_open(struct tty_struct *tty, struct file *file)
 
 	if (tty->count == 1 && !vktty->irq_enabled) {
 		timer_setup(&vk->serial_timer, bcm_vk_tty_poll, 0);
-		mod_timer(&vk->serial_timer, jiffies + SERIAL_TIMER_VALUE);
+		timer_mod(&vk->serial_timer, jiffies + SERIAL_TIMER_VALUE);
 	}
 	return 0;
 }
drivers/mmc/core/host.c +1 -1
index f14671ea5716..f975cf83860a 100644
@@ -111,7 +111,7 @@ void mmc_retune_enable(struct mmc_host *host)
 {
 	host->can_retune = 1;
 	if (host->retune_period)
-		mod_timer(&host->retune_timer,
+		timer_mod(&host->retune_timer,
 			  jiffies + host->retune_period * HZ);
 }
 
drivers/mmc/host/atmel-mci.c +3 -3
index 2179ea085e84..bf13a17b3bc4 100644
@@ -847,7 +847,7 @@ static void atmci_send_command(struct atmel_mci *host,
 	atmci_writel(host, ATMCI_ARGR, cmd->arg);
 	atmci_writel(host, ATMCI_CMDR, cmd_flags);
 
-	mod_timer(&host->timer, jiffies + msecs_to_jiffies(timeout_ms));
+	timer_mod(&host->timer, jiffies + msecs_to_jiffies(timeout_ms));
 }
 
 static void atmci_send_stop_cmd(struct atmel_mci *host, struct mmc_data *data)
@@ -2229,11 +2229,11 @@ static irqreturn_t atmci_detect_interrupt(int irq, void *dev_id)
 
 	/*
 	 * Disable interrupts until the pin has stabilized and check
-	 * the state then. Use mod_timer() since we may be in the
+	 * the state then. Use timer_mod() since we may be in the
 	 * middle of the timer routine when this interrupt triggers.
 	 */
 	disable_irq_nosync(irq);
-	mod_timer(&slot->detect_timer, jiffies + msecs_to_jiffies(20));
+	timer_mod(&slot->detect_timer, jiffies + msecs_to_jiffies(20));
 
 	return IRQ_HANDLED;
 }
drivers/mmc/host/dw_mmc.c +3 -3
index a291c57893c9..0c8597316671 100644
@@ -389,7 +389,7 @@ static inline void dw_mci_set_cto(struct dw_mci *host)
 	 */
 	spin_lock_irqsave(&host->irq_lock, irqflags);
 	if (!test_bit(EVENT_CMD_COMPLETE, &host->pending_events))
-		mod_timer(&host->cto_timer,
+		timer_mod(&host->cto_timer,
 			jiffies + msecs_to_jiffies(cto_ms) + 1);
 	spin_unlock_irqrestore(&host->irq_lock, irqflags);
 }
@@ -1366,7 +1366,7 @@ static void __dw_mci_start_request(struct dw_mci *host,
 		 */
 		spin_lock_irqsave(&host->irq_lock, irqflags);
 		if (!test_bit(EVENT_CMD_COMPLETE, &host->pending_events))
-			mod_timer(&host->cmd11_timer,
+			timer_mod(&host->cmd11_timer,
 				jiffies + msecs_to_jiffies(500) + 1);
 		spin_unlock_irqrestore(&host->irq_lock, irqflags);
 	}
@@ -2026,7 +2026,7 @@ static void dw_mci_set_drto(struct dw_mci *host)
 
 	spin_lock_irqsave(&host->irq_lock, irqflags);
 	if (!test_bit(EVENT_DATA_COMPLETE, &host->pending_events))
-		mod_timer(&host->dto_timer,
+		timer_mod(&host->dto_timer,
 			  jiffies + msecs_to_jiffies(drto_ms));
 	spin_unlock_irqrestore(&host->irq_lock, irqflags);
 }
drivers/mmc/host/jz4740_mmc.c +2 -2
index 740bcdf92be0..3d671fafecdd 100644
@@ -479,7 +479,7 @@ static unsigned int jz4740_mmc_poll_irq(struct jz4740_mmc_host *host,
 
 	if (timeout == 0) {
 		set_bit(0, &host->waiting);
-		mod_timer(&host->timeout_timer,
+		timer_mod(&host->timeout_timer,
 			  jiffies + msecs_to_jiffies(JZ_MMC_REQ_TIMEOUT_MS));
 		jz4740_mmc_set_irq_enabled(host, irq, true);
 		return true;
@@ -931,7 +931,7 @@ static void jz4740_mmc_request(struct mmc_host *mmc, struct mmc_request *req)
 
 	host->state = JZ4740_MMC_STATE_READ_RESPONSE;
 	set_bit(0, &host->waiting);
-	mod_timer(&host->timeout_timer,
+	timer_mod(&host->timeout_timer,
 		  jiffies + msecs_to_jiffies(JZ_MMC_REQ_TIMEOUT_MS));
 	jz4740_mmc_send_command(host, req->cmd);
 }
drivers/mmc/host/meson-mx-sdio.c +1 -1
index 939f4337bc55..d2a93baf23c7 100644
@@ -237,7 +237,7 @@ static void meson_mx_mmc_start_cmd(struct mmc_host *mmc,
 
 	spin_unlock_irqrestore(&host->irq_lock, irqflags);
 
-	mod_timer(&host->cmd_timeout, jiffies + timeout);
+	timer_mod(&host->cmd_timeout, jiffies + timeout);
 }
 
 static void meson_mx_mmc_request_done(struct meson_mx_mmc_host *host)
drivers/mmc/host/mvsdio.c +1 -1
index 101f36de7b63..3109b204ebe9 100644
@@ -233,7 +233,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
 	mvsd_write(MVSD_ERR_INTR_EN, 0xffff);
 
 	timeout = cmd->busy_timeout ? cmd->busy_timeout : 5000;
-	mod_timer(&host->timer, jiffies + msecs_to_jiffies(timeout));
+	timer_mod(&host->timer, jiffies + msecs_to_jiffies(timeout));
 
 	spin_unlock_irqrestore(&host->lock, flags);
 }
drivers/mmc/host/mxcmmc.c +1 -1
index e588e24256cc..b5d6cf300fe3 100644
@@ -339,7 +339,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
 	dmaengine_submit(host->desc);
 	dma_async_issue_pending(host->dma);
 
-	mod_timer(&host->watchdog, jiffies + msecs_to_jiffies(MXCMCI_TIMEOUT_MS));
+	timer_mod(&host->watchdog, jiffies + msecs_to_jiffies(MXCMCI_TIMEOUT_MS));
 
 	return 0;
 }
drivers/mmc/host/omap.c +3 -3
index 8bc0c4ea2211..c9ce18936d68 100644
@@ -271,7 +271,7 @@ static void mmc_omap_release_slot(struct mmc_omap_slot *slot, int clk_enabled)
 
 	if (clk_enabled)
 		/* Keeps clock running for at least 8 cycles on valid freq */
-		mod_timer(&host->clk_timer, jiffies  + HZ/10);
+		timer_mod(&host->clk_timer, jiffies  + HZ/10);
 	else {
 		timer_delete(&host->clk_timer);
 		mmc_omap_fclk_offdelay(slot);
@@ -394,7 +394,7 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd)
 	if (host->data && !(host->data->flags & MMC_DATA_WRITE))
 		cmdreg |= 1 << 15;
 
-	mod_timer(&host->cmd_abort_timer, jiffies + HZ/2);
+	timer_mod(&host->cmd_abort_timer, jiffies + HZ/2);
 
 	OMAP_MMC_WRITE(host, CTO, 200);
 	OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
@@ -899,7 +899,7 @@ static void mmc_omap_cover_bh_handler(struct work_struct *t)
 	if (slot->mmc->card == NULL)
 		return;
 
-	mod_timer(&slot->cover_timer,
+	timer_mod(&slot->cover_timer,
 		  jiffies + msecs_to_jiffies(OMAP_MMC_COVER_POLL_DELAY));
 }
 
drivers/mmc/host/sdhci.c +2 -2
index c6f972636356..a9bfad4e3e4a 100644
@@ -508,9 +508,9 @@ void sdhci_mod_timer(struct sdhci_host *host, struct mmc_request *mrq,
 		     unsigned long timeout)
 {
 	if (sdhci_data_line_cmd(mrq->cmd))
-		mod_timer(&host->data_timer, timeout);
+		timer_mod(&host->data_timer, timeout);
 	else
-		mod_timer(&host->timer, timeout);
+		timer_mod(&host->timer, timeout);
 }
 EXPORT_SYMBOL_GPL(sdhci_mod_timer);
 
drivers/mmc/host/tifm_sd.c +1 -1
index 5e5ec92f80e6..317550b69088 100644
@@ -712,7 +712,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
 	}
 
 	host->req = mrq;
-	mod_timer(&host->timer, jiffies + host->timeout_jiffies);
+	timer_mod(&host->timer, jiffies + host->timeout_jiffies);
 	writel(TIFM_CTRL_LED | readl(sock->addr + SOCK_CONTROL),
 	       sock->addr + SOCK_CONTROL);
 	tifm_sd_exec(host, mrq->cmd);
drivers/mmc/host/via-sdmmc.c +1 -1
index 9903966c2f54..0f74f9e73533 100644
@@ -563,7 +563,7 @@ static void via_sdc_send_command(struct via_crdr_mmc_host *host,
 	host->cmd = cmd;
 
 	timeout_ms = cmd->busy_timeout ? cmd->busy_timeout : VIA_CMD_TIMEOUT_MS;
-	mod_timer(&host->timer, jiffies + msecs_to_jiffies(timeout_ms));
+	timer_mod(&host->timer, jiffies + msecs_to_jiffies(timeout_ms));
 
 	/*Command index*/
 	cmdctrl = cmd->opcode << 8;
drivers/mmc/host/vub300.c +6 -6
index e4dff077d136..9f1a8561b269 100644
@@ -655,7 +655,7 @@ static void __do_poll(struct vub300_mmc_host *vub300)
 {
 	/* cmd_mutex is held by vub300_pollwork_thread */
 	unsigned long commretval;
-	mod_timer(&vub300->inactivity_timer, jiffies + HZ);
+	timer_mod(&vub300->inactivity_timer, jiffies + HZ);
 	init_completion(&vub300->irqpoll_complete);
 	send_irqpoll(vub300);
 	commretval = wait_for_completion_timeout(&vub300->irqpoll_complete,
@@ -694,7 +694,7 @@ static void vub300_pollwork_thread(struct work_struct *work)
 		} else if (vub300->irqs_queued) {
 			vub300->irqs_queued -= 1;
 			mmc_signal_sdio_irq(vub300->mmc);
-			mod_timer(&vub300->inactivity_timer, jiffies + HZ);
+			timer_mod(&vub300->inactivity_timer, jiffies + HZ);
 			mutex_unlock(&vub300->irq_mutex);
 		} else { /* NOT vub300->irqs_queued */
 			mutex_unlock(&vub300->irq_mutex);
@@ -733,7 +733,7 @@ static void vub300_deadwork_thread(struct work_struct *work)
 	} else {
 		check_vub300_port_status(vub300);
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/mmc/host/wbsd.c +1 -1
index 2ae787d966de..1503057e83f5 100644

Lines of this file are not shown. View the raw message.

drivers/most/most_usb.c +1 -1
index f59a93b65ffb..6a1fc2dd5085 100644

Lines of this file are not shown. View the raw message.

drivers/mtd/sm_ftl.c +1 -1
index abc7b186353f..bdd91e7cfcc1 100644

Lines of this file are not shown. View the raw message.

drivers/net/arcnet/arcnet.c +2 -2
index 882972604c82..b57c26beca4e 100644

Lines of this file are not shown. View the raw message.

drivers/net/can/grcan.c +1 -1
index c5784d9779ef..c0ebea037362 100644

Lines of this file are not shown. View the raw message.

drivers/net/can/kvaser_pciefd.c +3 -3
index ccb12b0bc9ac..bda42da8696f 100644

Lines of this file are not shown. View the raw message.

drivers/net/can/sja1000/peak_pcmcia.c +2 -2
index ce18e9e56059..4e622c2ed8c4 100644

Lines of this file are not shown. View the raw message.

drivers/net/can/usb/peak_usb/pcan_usb.c +1 -1
index 6b293a9056c2..dfa9b26c1240 100644

Lines of this file are not shown. View the raw message.

drivers/net/dsa/mv88e6xxx/phy.c +1 -1
index 4e7827ee684a..62bd19858c21 100644

Lines of this file are not shown. View the raw message.

drivers/net/dsa/sja1105/sja1105_ptp.c +1 -1
index 198e787e8560..ad42bda863a1 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/3com/3c515.c +1 -1
index 843035fbf7fe..7067a9f3576c 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/3com/3c589_cs.c +1 -1
index 77b8430787f9..0d917b8c5331 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/3com/3c59x.c +4 -4
index 8c9cc97efd4e..a4ed4fdeb248 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/8390/axnet_cs.c +1 -1
index 80ccea96887b..cc3ff92ec169 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/8390/pcnet_cs.c +1 -1
index 07ae1cc347a1..ae0123d3c070 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/agere/et131x.c +1 -1
index 5b0274f64318..95ce01eaa76a 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amazon/ena/ena_netdev.c +3 -3
index e4177c7bfa88..1c07c895a690 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/a2065.c +1 -1
index ce9445425045..21e48970e7ec 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/amd8111e.c +2 -2
index 4077a96847b0..a0a40432afac 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/declance.c +1 -1
index 8d05a0c5f2d5..ef551bba7e24 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/pcnet32.c +2 -2
index 9eaefa0f5e80..014001acb33d 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/pds_core/main.c +3 -3
index 9b81e1c260c2..3fa8d1479c4e 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/sunlance.c +1 -1
index 0b273327f5a6..6087d11ecbdf 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/xgbe/xgbe-dev.c +1 -1
index f393228d41c7..31e51b5d4e32 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/xgbe/xgbe-drv.c +3 -3
index 91f19eb286cd..97a87068a210 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/aquantia/atlantic/aq_nic.c +3 -3
index 99b124e40bdc..627fab31fce5 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/atheros/ag71xx.c +1 -1
index d8e6f23e1432..626ef76df18d 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/atheros/atlx/atl1.c +1 -1
index 6ad73d93a247..5e382f97a40f 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/atheros/atlx/atl2.c +3 -3
index b46a6a0fc7e4..e9d045bfc3f6 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/b44.c +2 -2
index 3db6bc4e30f5..4ed9ec3f2d9d 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/bcm63xx_enet.c +1 -1
index 986cc73f328f..f33f283d8f88 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/bnx2.c +4 -4
index cb1011f6fd30..e8e990cf2096 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +1 -1
index e59530357e2c..282dbd854d8c 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
index c9a1a1d504c0..c53b6a9d2781 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -2
index f181c72df902..f553e8e6ba5f 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/brocade/bna/bfa_ioc.c +10 -10
index 92c7639d1fc7..d6a555a18d33 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/brocade/bna/bnad.c +5 -5
index 93e8fd762769..a1986e558f5e 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/chelsio/cxgb/sge.c +5 -5
index 5f354cf62cdd..a1ae01596c4d 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/chelsio/cxgb3/sge.c +4 -4
index b59735d0e065..6dbf0889fabe 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c +2 -2
index 0765d000eaef..eaf96ee960c7 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/chelsio/cxgb4/sge.c +4 -4
index ecd53235dc9d..9153c39b0f3d 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/chelsio/cxgb4vf/sge.c +4 -4
index 4e6ecb9c8dcc..47b901016adc 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/cisco/enic/enic_clsf.c +1 -1
index 837f954873ee..7f0be15161b3 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/cisco/enic/enic_clsf.h +1 -1
index 5f5284102fb0..b4620ea19301 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/cisco/enic/enic_main.c +2 -2
index 8f933bdd1c81..d77108d102ab 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/dec/tulip/21142.c +2 -2
index 09c2682ae07c..67ee17456c5b 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/dec/tulip/de2104x.c +4 -4
index 0bc15c31023a..b5decae426c3 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/dec/tulip/interrupt.c +3 -3
index 0a12cb9b3ba7..caaa7cf5c930 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/dec/tulip/pnic.c +1 -1
index 1de5ed967070..bdc434f73c67 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/dec/tulip/pnic2.c +1 -1
index 181a2612f00a..a4fcd8ff59bd 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/dec/tulip/timer.c +5 -5
index 88d771c24d74..92699f7b74b7 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/dec/tulip/winbond-840.c +1 -1
index 4f988135e0b0..69be2b4dba3f 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/google/gve/gve_ethtool.c +1 -1
index eae1a7595a69..5a2f3bb188aa 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/google/gve/gve_main.c +2 -2
index 27f34dfa0390..19cb9b2daf70 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/hisilicon/hns/hns_enet.c +2 -2
index e905f10b894e..5860d0856fd9 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +2 -2
index a7de67699a01..2bcdc7384239 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +1 -1
index 5b02fe91f073..9dbc41ac2463 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/e100.c +3 -3
index 5c56c1edd492..352fc21b3e06 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/e1000e/netdev.c +6 -6
index b6a39f691581..6a13e90ab761 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/fm10k/fm10k_pci.c +3 -3
index 3b821a31c4e0..c4bac2169ef8 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/i40e/i40e_main.c +4 -4
index f1c9e575703e..aa486d7e6da7 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/ice/ice_main.c +6 -6
index 10930146e45d..13f7482ef724 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c +1 -1
index 05fea471de90..3df578b13528 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/igb/igb_main.c +7 -7
index 8f3506984ca8..ee58d6e86397 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/igbvf/netdev.c +4 -4
index 92c8bfb15c3e..66da2619abae 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/igc/igc_main.c +7 -7
index 283df6b04a47..1712a87e54e5 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -2
index cd53199cf768..9e336933671a 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +2 -2
index 5f71cd7c11a7..ab2d3e248909 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/korina.c +2 -2
index b80014ef6539..8bb0ffd86e88 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/marvell/mv643xx_eth.c +2 -2
index a056094f02ee..333135649520 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/marvell/skge.c +3 -3
index 05349a0b2db1..b0c6f3cc6fde 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/marvell/sky2.c +2 -2
index 3831f533b9db..2ba60c1bfa3a 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/mellanox/mlx4/catas.c +1 -1
index 38a9c51c7f43..4d062d7308b7 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +1 -1
index 75b3a1561f92..0c44247c417c 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/mellanox/mlx5/core/health.c +1 -1
index c2a7fe22367e..108f57f2d098 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 -1
index 5639306c525d..a2bd598e40fe 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/natsemi/natsemi.c +4 -4
index 5d838369607f..3e6bc6b40636 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/natsemi/ns83820.c +2 -2
index 56d5464222d9..702c55c74fa1 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/neterion/s2io.c +2 -2
index 27443e346f9f..e5fa16e3f09a 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/netronome/nfp/nfp_net_common.c +1 -1
index 75bdf75c2dec..b152d7707fde 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/nvidia/forcedeth.c +14 -14
index 19aa1f1538aa..19c405c01758 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +2 -2
index 3f2739a479b0..b22abf76bd6a 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/pasemi/pasemi_mac.c +3 -3
index 4e00175533e9..381d3637f90f 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +2 -2
index 4c377bdc62c8..05e45162dae6 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/pensando/ionic/ionic_dev.c +1 -1
index 18b9c8a810ae..93c389dfd054 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/pensando/ionic/ionic_lif.c +1 -1
index 7707a9e53c43..abb09be28f03 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/qlogic/qla3xxx.c +3 -3
index aee4e63b4b82..05c258a4a08f 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/realtek/atp.c +1 -1
index ac389394c139..eb6adf59d207 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/rocker/rocker_ofdpa.c +3 -3
index c7170b21c445..cb09f2cbc0b0 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +3 -3
index cbbec53e9957..cb1bf9849987 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sfc/falcon/efx.c +1 -1
index b07f7e4e2877..3be48b9cd0c3 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sfc/falcon/falcon.c +1 -1
index 182a393ef6bc..6efed6c278c8 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sfc/mcdi.c +2 -2
index 5e9b8def5e42..dbc7ec5cd866 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sfc/rx_common.c +1 -1
index d28957288413..3817d110e3b4 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sfc/siena/mcdi.c +2 -2
index c8f0fb43e285..af1a402de0b3 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sfc/siena/rx_common.c +1 -1
index 9f97f590c2fb..1007cc0b59ed 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sis/sis190.c +2 -2
index c157aeea2f57..b488fa309665 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/smsc/smc91c92_cs.c +1 -1
index bf57a5b4647a..ce880556a900 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c +2 -2
index 6babf2f2fcd3..2b9274bbe2a2 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
index f173a7689331..83ad68896b86 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sun/cassini.c +5 -5
index acfb523214b9..4f78dc4c03c4 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sun/sungem.c +3 -3
index 8e69d917d827..f5548eabcd77 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sun/sunvnet_common.c +3 -3
index 0212853c9430..87474e61fc92 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c +1 -1
index 76eb7db80f13..8d6a19a27c00 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/ti/tlan.c +1 -1
index fb7a23dead36..f4cf5dd077a2 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/tundra/tsi108_eth.c +2 -2
index 7e0b3d694ac0..1fc84b55c063 100644

Lines of this file are not shown. View the raw message.

drivers/net/hamradio/6pack.c +4 -4
index c5e5423e1863..5a09f3c20912 100644

Lines of this file are not shown. View the raw message.

drivers/net/ntb_netdev.c +2 -2
index fbeae05817e9..d4a9dfa2ceae 100644

Lines of this file are not shown. View the raw message.

drivers/net/phy/phylink.c +3 -3
index b68369e2342b..7e9d682bc9df 100644

Lines of this file are not shown. View the raw message.

drivers/net/slip/slip.c +6 -6
index 1a2950f95221..488ffd4dd0b6 100644

Lines of this file are not shown. View the raw message.

drivers/net/tun.c +3 -3
index afd3c4a8c3ea..57b6792f25d7 100644

Lines of this file are not shown. View the raw message.

drivers/net/usb/catc.c +2 -2
index 6759388692f8..0193e0f028af 100644

Lines of this file are not shown. View the raw message.

drivers/net/usb/lan78xx.c +4 -4
index 7377188fb476..fc6fce01d204 100644

Lines of this file are not shown. View the raw message.

drivers/net/usb/usbnet.c +2 -2
index c04e715a4c2a..8c0806316d87 100644

Lines of this file are not shown. View the raw message.

drivers/net/vxlan/vxlan_core.c +3 -3
index 2cd67b3b7975..9e760bf7f6bf 100644

Lines of this file are not shown. View the raw message.

drivers/net/wan/hdlc_ppp.c +3 -3
index 7889fe51f346..9d025a02ff73 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireguard/timers.c +1 -1
index 3061e20fcc22..fe373486d955 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ar5523/ar5523.c +2 -2
index 343c9de2749c..545b9ff09462 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath10k/htt_rx.c +2 -2
index 47829b109192..fe0428acdad5 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath10k/pci.c +2 -2
index c88fb71af708..57e4233be777 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath10k/sdio.c +1 -1
index 1d77971652fa..f0e51b483458 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath10k/snoc.c +1 -1
index 522f7384c362..1ce0ae8f59a6 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath11k/ce.c +2 -2
index be1aebe48d1a..41474183dfbc 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath11k/dp.c +2 -2
index 7295020c7806..8e72a7d6498b 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath11k/dp_rx.c +3 -3
index cb2fc5a257c3..ee97911df24c 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath11k/dp_tx.c +1 -1
index 8522c67baabf..4e89ad0a87aa 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath11k/mac.c +1 -1
index 97816916abac..5f0e75589f28 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath12k/ce.c +2 -2
index 45acc6fbf828..135af2fb7554 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath12k/dp.c +1 -1
index d7077f8153e1..cb54573ff183 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath12k/dp_rx.c +1 -1
index 51237c7ed9d8..54115483cde9 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath6kl/cfg80211.c +1 -1
index 8c2e8081112e..b04354281cc0 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath6kl/recovery.c +4 -4
index 43186c193df1..11cd935e5134 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath6kl/txrx.c +2 -2
index 87dc2237c3ee..ebda8274c156 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath6kl/wmi.c +1 -1
index 84317afe4651..1c2527811255 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/channel.c +4 -4
index 121e51ce1bc0..33e47caa00a3 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/gpio.c +3 -3
index 8b9bde7135d4..9967ce6aad5a 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/htc_drv_main.c +3 -3
index 19600018e562..a1e9cdbeb0b2 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +1 -1
index 320dfbc64eab..aa7688ce241c 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/link.c +2 -2
index 5d7e3ddb6dbc..5a0cb2096075 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/main.c +1 -1
index c56f4f3b8990..0dafd75b0eca 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/wcn36xx/dxe.c +1 -1
index 0f4df5585fd9..18ae3ba63aab 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/wil6210/cfg80211.c +3 -3
index 5473c01cbe66..0d360b2a6698 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/wil6210/p2p.c +2 -2
index f20caf1a3905..a99c571eceef 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/atmel/at76c50x-usb.c +2 -2
index 4f01189b7c4b..cd27e15bba4b 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +3 -3
index 34c7e04f8444..90267b044db3 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
index d98323342c69..ab34a3fbd395 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2 -2
index 82b526b476f0..f3fcd889e2cc 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +2 -2
index bd2e602fd027..11855fb224c7 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlegacy/3945-rs.c +2 -2
index 229c36116b60..4347c651feb6 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlegacy/4965-mac.c +1 -1
index 8e58e97a148f..31f41cabe6ba 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlegacy/common.c +2 -2
index 9a86688aea67..384e16ae68f7 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c +1 -1
index 2ed4b6e798ab..75aeef6372c7 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/dvm/main.c +2 -2
index 9360a730c0b5..290edf329c4c 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/dvm/rx.c +1 -1
index 7f67e602940c..aa7b34a451c1 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/dvm/tt.c +3 -3
index 612be73761b5..61906ac76202 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +2 -2
index 4bb6e11d74ba..703708449429 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/mld/agg.c +2 -2
index 301959bb269f..1918672bb4ec 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/mvm/sta.c +2 -2
index 728df20bf990..547ab66b537c 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +2 -2
index 71227fd3dac0..12a98c509489 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/intel/iwlwifi/pcie/tx.c +4 -4
index 25bf2efb785c..60eb87dacc7d 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/libertas/cmd.c +1 -1
index 21fde876bb0d..ac333c652d6e 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/libertas/if_usb.c +1 -1
index b3c4040257a6..7e448d8acd70 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/libertas/main.c +1 -1
index 01a79452c400..c69159087b20 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/libertas_tf/cmd.c +1 -1
index 7fc1bdb6c458..fc035dbcacbe 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/libertas_tf/if_usb.c +1 -1
index 5662a244f82a..1e12eb1aa582 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +1 -1
index 354c5ce66045..a348e4d2ba15 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/mwifiex/cmdevt.c +1 -1
index 062b739db1cb..81ec92e6d1fd 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/mwifiex/main.c +1 -1
index 0e1f53940401..72805c9e6224 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/mwifiex/tdls.c +2 -2
index 80121401111e..32bd06b99947 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/marvell/mwifiex/usb.c +3 -3
index 947ecb0a7b40..8dc0c74f3ba9 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +1 -1
index b8fcd4eb3fbb..1e4ba8449f61 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -1
index 37b73be38b71..b0eaef2974bf 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +1 -1
index 86bd33b916a9..cc085b63b4c3 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +1 -1
index e61da76b2097..78f14e724813 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/microchip/wilc1000/cfg80211.c +1 -1
index e7aa0f991923..c6e0b804b759 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/microchip/wilc1000/hif.c +4 -4
index a5a2a6ef6dea..49f311a0f512 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/purelifi/plfxlc/usb.c +2 -2
index 89e6c5dddcc5..386435d9dbf9 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/realtek/rtlwifi/base.c +1 -1
index 1b7a795841d3..d4d42983e54a 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c +1 -1
index ef279f5005fd..20a002dd0312 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c +3 -3
index 516be255afcc..42f1168362e9 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c +3 -3
index d4da5cdc8414..e6184cd2cc73 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +3 -3
index bcfc53af4c1a..698d613e87ee 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +3 -3
index f4b232f038a9..6bca3206ff12 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/realtek/rtw88/tx.c +1 -1
index d21bd5330a38..c5d0e39cf54a 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/st/cw1200/pm.c +1 -1
index 2002e3f9fe45..76c501f6f2dd 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/st/cw1200/queue.c +2 -2
index a933e2c7dc2c..df717cef4b56 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/st/cw1200/sta.c +1 -1
index e633b77a8f20..0db11c6e8007 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ti/wlcore/main.c +1 -1
index 88cab6699d58..6e6647e039e4 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ti/wlcore/tx.c +1 -1
index 464587d16ab2..61690088f1db 100644

Lines of this file are not shown. View the raw message.

drivers/net/xen-netback/netback.c +1 -1
index 563397ba7d69..c67d22f20fc1 100644

Lines of this file are not shown. View the raw message.

drivers/net/xen-netfront.c +1 -1
index 01bf49bba4da..07f99fc98378 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/nfcmrvl/fw_dnld.c +1 -1
index 9992177b08b2..bd1ab574f603 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/pn533/pn533.c +2 -2
index 14661249c690..0a51e9a8a28b 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/pn533/uart.c +1 -1
index a081bce61c29..4110d8003e3b 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/st-nci/ndlc.c +4 -4
index be4808859cfa..65fac03fd64d 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/st-nci/se.c +4 -4
index ff5c3d56b337..7c83f3a4ca46 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/st21nfca/core.c +1 -1
index bec6f607c32c..022f40e4415a 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/st21nfca/se.c +3 -3
index 0a21bc515141..30bc86e15163 100644

Lines of this file are not shown. View the raw message.

drivers/nvme/host/multipath.c +1 -1
index 7b8eaefb322d..9a0df22ad7ab 100644

Lines of this file are not shown. View the raw message.

drivers/parport/ieee1284.c +1 -1
index 4035010249cd..5fa5f3b7131f 100644

Lines of this file are not shown. View the raw message.

drivers/pcmcia/bcm63xx_pcmcia.c +2 -2
index d3baed444646..06279928810f 100644

Lines of this file are not shown. View the raw message.

drivers/pcmcia/electra_cf.c +1 -1
index 2530079d38f4..56a657239fc8 100644

Lines of this file are not shown. View the raw message.

drivers/pcmcia/omap_cf.c +2 -2
index 1b1dff56ec7b..872f17d7143c 100644

Lines of this file are not shown. View the raw message.

drivers/pcmcia/pd6729.c +2 -2
index 5261badcd903..a4704d94d68f 100644

Lines of this file are not shown. View the raw message.

drivers/pcmcia/soc_common.c +1 -1
index 87aa3f667117..e27c79002484 100644

Lines of this file are not shown. View the raw message.

drivers/pcmcia/yenta_socket.c +1 -1
index f0145938cae2..e7d9b1edf505 100644

Lines of this file are not shown. View the raw message.

drivers/platform/mellanox/mlxbf-tmfifo.c +2 -2
index aae99adb29eb..6c3cb2e58a57 100644

Lines of this file are not shown. View the raw message.

drivers/platform/x86/intel_ips.c +1 -1
index 84d7ea34481d..a4e7af419386 100644

Lines of this file are not shown. View the raw message.

drivers/platform/x86/sony-laptop.c +2 -2
index b52390fbd743..040798920189 100644

Lines of this file are not shown. View the raw message.

drivers/pps/clients/pps-ktimer.c +2 -2
index 121bd29d863d..88561c48f1ea 100644

Lines of this file are not shown. View the raw message.

drivers/pps/generators/pps_gen-dummy.c +1 -1
index 547fa7fe29f4..1133748ae779 100644

Lines of this file are not shown. View the raw message.

drivers/ptp/ptp_ocp.c +2 -2
index eed47dcaa3de..99ede52de4fc 100644

Lines of this file are not shown. View the raw message.

drivers/s390/block/dasd.c +2 -2
index b16efecfde4b..59b364804725 100644

Lines of this file are not shown. View the raw message.

drivers/s390/char/con3270.c +1 -1
index 78893459c59c..be1ecb2b3ab5 100644

Lines of this file are not shown. View the raw message.

drivers/s390/char/sclp.c +2 -2
index f50a28ee6451..f85d6edb64cd 100644

Lines of this file are not shown. View the raw message.

drivers/s390/char/sclp_con.c +1 -1
index d8544c485808..bc4d80a37cc8 100644

Lines of this file are not shown. View the raw message.

drivers/s390/char/sclp_tty.c +1 -1
index 0a92d08830e7..2198294a59d6 100644

Lines of this file are not shown. View the raw message.

drivers/s390/char/tape_std.c +1 -1
index ef5d34168a01..f4371e0a125b 100644

Lines of this file are not shown. View the raw message.

drivers/s390/cio/device.c +2 -2
index fb2c07cb4d3d..62cdd7b087f8 100644

Lines of this file are not shown. View the raw message.

drivers/s390/cio/device_fsm.c +1 -1
index e849d3271b0e..e29ddd74504f 100644

Lines of this file are not shown. View the raw message.

drivers/s390/cio/eadm_sch.c +1 -1
index 37ea30be710c..c8889294773b 100644

Lines of this file are not shown. View the raw message.

drivers/s390/crypto/ap_bus.c +2 -2
index 09b9fe81b070..0dc43c4a1dfc 100644

Lines of this file are not shown. View the raw message.

drivers/s390/crypto/ap_queue.c +2 -2
index 4088fda07197..f70ad97ea5e6 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/arcmsr/arcmsr_hba.c +5 -5
index 154d971e5b50..48ce4ba44bc7 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/arm/fas216.c +2 -2
index b1a749ab18f8..9e535ff23153 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/be2iscsi/be_main.c +3 -3
index dc88bc46dcc0..df0110fe2b86 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/bfa/bfad.c +2 -2
index 0768f086451b..ff66f21c0ff7 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/bnx2fc/bnx2fc_tgt.c +2 -2
index 77dcdfc412b1..429d4f350766 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/csiostor/csio_hw.c +1 -1
index 7aa418ebfe01..131277419aab 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/csiostor/csio_mb.c +1 -1
index c7b4c464f6b8..b8dd7a38e389 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +1 -1
index 69de9657f7cb..43cc6e22daa3 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +1 -1
index 42676627c3af..f5a27d130d77 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/elx/efct/efct_xport.c +1 -1
index dfe05fab7b42..247bfc19f439 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/elx/libefc/efc_els.c +1 -1
index 1786cee08729..db2a1ce3df40 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/elx/libefc/efc_fabric.c +1 -1
index 4ed9f46ded65..0599bce2475b 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/fcoe/fcoe_ctlr.c +6 -6
index 8e4241c295e3..a88c16cc5fb2 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/fcoe/fcoe_transport.c +1 -1
index 2f478426f16e..dd964b0d6e50 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/fnic/fdls_disc.c +5 -5
index ab5c0cf142ee..51f74255121c 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/fnic/fip.c +11 -11
index becdcabafd8c..2a3d93a91e22 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/fnic/fnic_main.c +2 -2
index 4cc4077ea53c..96ae8b5f58f1 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +1 -1
index a92679060ad3..794e525182b1 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +3 -3
index 945c2d52d10c..8ab4a858bb97 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/ibmvscsi/ibmvfc.c +1 -1
index 40d226e8bb2e..f819563e7c93 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/isci/isci.h +1 -1
index d827e49c1d55..faa9083d1b17 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/libfc/fc_fcp.c +1 -1
index 16d0f02af1e4..28cb655550df 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/libiscsi.c +3 -3
index bd15c749228d..1f3c61700dd7 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_els.c +7 -7
index 83eec96f1043..5b61c7ffb836 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_hbadisc.c +1 -1
index 2eaf46be8bb7..20d388268a12 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_init.c +9 -9
index 68e6ba085b2b..3064ef4e332f 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_nportdisc.c +7 -7
index a596b80d03d4..4a5724aee928 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_scsi.c +1 -1
index 8acb744febcd..9de89e9547de 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_sli.c +10 -10
index b694fe1bf714..31a8b4ead10e 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_vmid.c +1 -1
index 14dbfe954e42..966f3ebda33a 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/megaraid/megaraid_sas_base.c +1 -1
index 3e1a19b199cd..d7794bb4fa83 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla1280.c +1 -1
index 6af018f1ca22..d57178478872 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla2xxx/qla_os.c +1 -1
index 5482320ac18b..724f76103c70 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla4xxx/ql4_os.c +2 -2
index 94205369321a..7fc946d7ce47 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/smartpqi/smartpqi_init.c +1 -1
index e1912f5f8528..a1c0dfcba979 100644

Lines of this file are not shown. View the raw message.

drivers/staging/gpib/agilent_82357a/agilent_82357a.c +2 -2
index c4f49e20d5f3..622212afad1f 100644

Lines of this file are not shown. View the raw message.

drivers/staging/gpib/common/gpib_os.c +3 -3
index e6693046d262..c27bcc592df3 100644

Lines of this file are not shown. View the raw message.

drivers/staging/gpib/common/iblib.c +1 -1
index f8c762012d54..5d9ef387edbb 100644

Lines of this file are not shown. View the raw message.

drivers/staging/gpib/ni_usb/ni_usb_gpib.c +2 -2
index ff0931e1ce01..7f55a26c44ee 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/imx/imx-ic-prpencvf.c +2 -2
index 77360bfe081a..6e6880b8dcf8 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/imx/imx-media-csi.c +2 -2
index a7cd3ef95fc3..daad856dffb7 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8723bs/include/osdep_service_linux.h +1 -1
index 2ec54f9e180c..ef0b36ef52af 100644

Lines of this file are not shown. View the raw message.

drivers/target/iscsi/iscsi_target_erl0.c +1 -1
index e11b84c6abe2..b31a2c8331f9 100644

Lines of this file are not shown. View the raw message.

drivers/target/iscsi/iscsi_target_erl1.c +2 -2
index d8ca06e697d6..29f8740c7df9 100644

Lines of this file are not shown. View the raw message.

drivers/target/iscsi/iscsi_target_util.c +4 -4
index a607366f9d2a..627a5819579c 100644

Lines of this file are not shown. View the raw message.

drivers/target/target_core_user.c +2 -2
index 3fd963612775..355a768e3f81 100644

Lines of this file are not shown. View the raw message.

drivers/tty/ipwireless/hardware.c +1 -1
index e18848267be4..4babc829ccdd 100644

Lines of this file are not shown. View the raw message.

drivers/tty/mips_ejtag_fdc.c +1 -1
index 6f2d3cf4f7cf..f5ec2b8e258d 100644

Lines of this file are not shown. View the raw message.

drivers/tty/moxa.c +2 -2
index 329b30fac8fc..0bc14ef6f97a 100644

Lines of this file are not shown. View the raw message.

drivers/tty/n_gsm.c +12 -12
index 7fc535452c0b..ebba5439cdb9 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/8250/8250_aspeed_vuart.c +2 -2
index 8c25ef774566..01140359dbb4 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/8250/8250_core.c +4 -4
index a7e09fa7df94..7702e2449f7f 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/altera_uart.c +2 -2
index 837991dc4db9..e0a7fdb19a96 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/amba-pl011.c +3 -3
index 6b870db7230d..711604f7e1e0 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/atmel_serial.c +3 -3
index 3b4fb5f8a1d1..c460fe7347cf 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/fsl_lpuart.c +2 -2
index 549b355cd8d2..4c5973961788 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/imx.c +2 -2
index bd02ee898f5d..bca37f204c96 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/liteuart.c +2 -2
index 6429e8f11f36..81b632fe1224 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/max3100.c +2 -2
index 52ab244c2515..2b452789d0df 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/mux.c +2 -2
index b417faead20f..23e1134f7b74 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/sa1100.c +2 -2
index 72b1bb76415c..02013f3104d5 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/sccnxp.c +2 -2
index 4ceca11ce600..4d01ea194da3 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/sh-sci.c +1 -1
index 791e59a4e4ea..3b5d235686ae 100644

Lines of this file are not shown. View the raw message.

drivers/tty/synclink_gt.c +2 -2
index 3865b10d2d43..6d5992b96af5 100644

Lines of this file are not shown. View the raw message.

drivers/tty/sysrq.c +1 -1
index a52d77ca5314..8ff6be11dfdb 100644

Lines of this file are not shown. View the raw message.

drivers/tty/vt/keyboard.c +1 -1
index ae92e6a50a65..acb72c5d89b8 100644

Lines of this file are not shown. View the raw message.

drivers/tty/vt/vt.c +4 -4
index f5642b3038e4..36724bba0ed0 100644

Lines of this file are not shown. View the raw message.

drivers/usb/atm/cxacru.c +1 -1
index c23023465dfc..2006a580061d 100644

Lines of this file are not shown. View the raw message.

drivers/usb/atm/speedtch.c +4 -4
index 2f379479d8c4..110aeb903139 100644

Lines of this file are not shown. View the raw message.

drivers/usb/atm/usbatm.c +2 -2
index 5f3ad9a99d9e..949fb8875c5d 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/hcd.c +4 -4
index c22de97432a0..35296acb1a87 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/hub.c +1 -1
index 340c23509d07..19990eaaa75b 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc2/core_intr.c +1 -1
index 7d3e641806f8..fadf761d5c28 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc2/hcd.c +2 -2
index 30eb8506617c..9583dc4abb1e 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc2/hcd_queue.c +1 -1
index 904fe0632b34..6c0f196f7348 100644

Lines of this file are not shown. View the raw message.

drivers/usb/fotg210/fotg210-hcd.c +2 -2
index 64c4965a160f..79dde808da05 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/legacy/zero.c +1 -1
index a05785bdeb30..bce1934fb453 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/at91_udc.c +2 -2
index 42b94d858e37..a1e69efcddb0 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/dummy_hcd.c +1 -1
index 59e0e4f551dd..de50a226ba3b 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/m66592-udc.c +4 -4
index 715791737499..644f93462de9 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/omap_udc.c +2 -2
index 062bf2b57d2e..1b172e9be675 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/pxa25x_udc.h +1 -1
index 6ab6047edc83..6bf534f8245c 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/r8a66597-udc.c +4 -4
index e5c2630e3711..4aa631fa66c3 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/snps_udc_core.c +6 -6
index e993b3011fce..0d2893f64118 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ehci-hcd.c +1 -1
index 6d1d190c914d..a135d1ea6097 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ehci-hub.c +2 -2
index 1aee392e8492..900beda5855a 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ehci-platform.c +2 -2
index 4f69c7231515..e967d6599735 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/isp116x-hcd.c +1 -1
index 71c22c4bd163..e5af484c4de0 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ohci-hcd.c +2 -2
index 5c662f8e7896..6b31f199363f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/oxu210hp-hcd.c +3 -3
index 6b7c73eff081..a54b4a22cc32 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/r8a66597-hcd.c +4 -4
index 8b71f45ef985..39f9d018a829 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/sl811-hcd.c +2 -2
index ea3cab99c5d4..ae697980b3c7 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/uhci-hcd.c +2 -2
index 14e6dfef16c6..2e86294bf2e7 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/uhci-hub.c +1 -1
index 47106dd8ca7c..fb218fc129c6 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/uhci-q.c +2 -2
index 9480d4ff0111..77b0594855dd 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xen-hcd.c +1 -1
index 1c2a95fe41e5..6194db180aab 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-hub.c +1 -1
index c0f226584a40..4576ee1b9201 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-ring.c +1 -1
index 5d64c297721c..7fb793afa333 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci.c +1 -1
index 172b2ab79557..e22b27a684c7 100644

Lines of this file are not shown. View the raw message.

drivers/usb/isp1760/isp1760-hcd.c +1 -1
index 4803052a9098..0980c3381bac 100644

Lines of this file are not shown. View the raw message.

drivers/usb/isp1760/isp1760-udc.c +2 -2
index 65ac91d0595a..18635b9127a1 100644

Lines of this file are not shown. View the raw message.

drivers/usb/misc/usbtest.c +1 -1
index 63dba8e344f7..2cf7bad70f39 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/da8xx.c +5 -5
index 65ab223a2939..054311b0ebe5 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/mpfs.c +5 -5
index 3e96893bba4a..1a8024a8afce 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/musb_core.c +2 -2
index c7234b236971..657383f35ca5 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/musb_dsps.c +1 -1
index 12f587ab8511..32a4e3256046 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/musb_virthub.c +1 -1
index ce6f25a9650b..816b12df4d28 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/tusb6010.c +1 -1
index 1d9571f24a56..8ca77eb783cc 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/garmin_gps.c +1 -1
index bd73857ab46f..711de522095f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/mos7840.c +2 -2
index 9e9aca271c0a..0d80f8dc90b4 100644

Lines of this file are not shown. View the raw message.

drivers/usb/storage/realtek_cr.c +1 -1
index 3075097f33bc..632e05dd7f62 100644

Lines of this file are not shown. View the raw message.

drivers/usb/usbip/vudc_transfer.c +2 -2
index a4f02ea3e3ef..c6db17e72f32 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbdev/aty/radeon_backlight.c +2 -2
index bf764c92bcf1..ad7ea2512753 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbdev/aty/radeon_base.c +2 -2
index 0eef8c6b98c8..fb518aefe570 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbdev/omap/hwa742.c +1 -1
index 64e76e1f5388..8759abfd501c 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbdev/omap2/omapfb/dss/dsi.c +1 -1
index 370e8623754e..2c0f933932c8 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbdev/pxa3xx-gcu.c +1 -1
index 4a78b387b343..675955bdf7db 100644

Lines of this file are not shown. View the raw message.

drivers/virt/vboxguest/vboxguest_core.c +2 -2
index b177a534b6a4..8b36255a0697 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/alim7101_wdt.c +2 -2
index 03a559b41f5b..5636ef5de235 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/at91sam9_wdt.c +2 -2
index aba66b8e9d03..45c4c030f393 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/bcm47xx_wdt.c +1 -1
index e13ec0975bef..2d7b8410749d 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/lpc18xx_wdt.c +1 -1
index f89739e4627b..fc4068e4efa3 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/machzwd.c +2 -2
index 0ae8e5bc10ae..e71e76284f6f 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/mixcomwd.c +2 -2
index 1ecd5c48a005..f2e55b16a803 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/mtx-1_wdt.c +2 -2
index f75426cfa425..128405419d69 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/pcwd.c +2 -2
index d4ea7d6ccd6a..36fe760cfcba 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/pika_wdt.c +2 -2
index 87b8988d2520..b16b0cfbc3a0 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/rdc321x_wdt.c +2 -2
index 8955177072fa..e1b6247230c2 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/sbc60xxwdt.c +2 -2
index 03eaf48c8f0f..4fee31f51802 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/sc520_wdt.c +2 -2
index 005f62e4a4fb..9f7b745ff532 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/shwdt.c +2 -2
index 719f100aae60..f397f18c4c9a 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/via_wdt.c +3 -3
index d647923d68fe..f34b224ff982 100644

Lines of this file are not shown. View the raw message.

drivers/watchdog/w83877f_wdt.c +2 -2
index 53db59ef774b..6edc495ac1ca 100644

Lines of this file are not shown. View the raw message.

fs/afs/server.c +1 -1
index 8755f2703815..033116dbbff7 100644

Lines of this file are not shown. View the raw message.

fs/bcachefs/clock.c +1 -1
index d6dd12d74d4f..1db45b9714ca 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/zstd.c +2 -2
index 3541efa765c7..85ca879849c2 100644

Lines of this file are not shown. View the raw message.

fs/dlm/lock.c +2 -2
index 6dd3a524cd35..e4d9cd63ec7c 100644

Lines of this file are not shown. View the raw message.

fs/ext4/super.c +3 -3
index c16419e8f5ef..b10b44378f20 100644

Lines of this file are not shown. View the raw message.

fs/lockd/svclock.c +1 -1
index c1315df4b350..063d0b1d9b34 100644

Lines of this file are not shown. View the raw message.

fs/ocfs2/cluster/tcp.c +1 -1
index 8247d34994a9..44aa45e03a01 100644

Lines of this file are not shown. View the raw message.

fs/pstore/platform.c +1 -1
index f8b9c9c73997..e376f69d489f 100644

Lines of this file are not shown. View the raw message.

include/linux/timer.h +2 -2
index cc6903ba363f..b3d2ab87c248 100644

Lines of this file are not shown. View the raw message.

include/net/cfg80211.h +2 -2
index efbd79c67be2..57a1e333d609 100644

Lines of this file are not shown. View the raw message.

include/rdma/rdmavt_qp.h +1 -1
index d67892944193..13723f4449c0 100644

Lines of this file are not shown. View the raw message.

kernel/events/uprobes.c +1 -1
index 8d783b5882b6..9aec992bde12 100644

Lines of this file are not shown. View the raw message.

kernel/irq/spurious.c +2 -2
index 02b2daf07441..e7e19ae3e1f9 100644

Lines of this file are not shown. View the raw message.

kernel/kcsan/kcsan_test.c +1 -1
index 6ce73cceaf53..ef4ea881ba96 100644

Lines of this file are not shown. View the raw message.

kernel/rcu/rcutorture.c +1 -1
index 4fa7772be183..d630df4372ec 100644

Lines of this file are not shown. View the raw message.

kernel/rcu/tasks.h +2 -2
index d72399187d6d..3f21549a48e6 100644

Lines of this file are not shown. View the raw message.

kernel/rcu/tree_nocb.h +3 -3
index 3fffd29e1f99..83b04e5070c3 100644

Lines of this file are not shown. View the raw message.

kernel/sched/psi.c +1 -1
index ad04a5c3162a..75f1eadef249 100644

Lines of this file are not shown. View the raw message.

kernel/time/timer.c +8 -8
index c86cb7ca85f2..c5f5d9fc854f 100644

Lines of this file are not shown. View the raw message.

kernel/workqueue.c +7 -7
index ae4cbd1b2add..e4860d6ea594 100644

Lines of this file are not shown. View the raw message.

lib/test_ref_tracker.c +1 -1
index b983ceb12afc..174ec7b8d330 100644

Lines of this file are not shown. View the raw message.

mm/page-writeback.c +3 -3
index 96c12e7cf77e..f0d543661bc9 100644

Lines of this file are not shown. View the raw message.

net/802/garp.c +1 -1
index 2d1ffc4d9462..9161ecb70019 100644

Lines of this file are not shown. View the raw message.

net/802/mrp.c +2 -2
index 23a88305f900..5822ff1f9195 100644

Lines of this file are not shown. View the raw message.

net/appletalk/aarp.c +4 -4
index 43d9bca10b73..e6343d578c6c 100644

Lines of this file are not shown. View the raw message.

net/atm/clip.c +2 -2
index 61b5b700817d..add1418ff16b 100644

Lines of this file are not shown. View the raw message.

net/atm/lec.c +1 -1
index ca452b2982c2..d19d3970ee36 100644

Lines of this file are not shown. View the raw message.

net/ax25/ax25_ds_timer.c +1 -1
index 0c9e7775aa54..41136f4f883b 100644

Lines of this file are not shown. View the raw message.

net/ax25/ax25_timer.c +5 -5
index a69bfbc8b679..9e404c8032e5 100644

Lines of this file are not shown. View the raw message.

net/batman-adv/tp_meter.c +2 -2
index 350b149e48be..1b415a8d9664 100644

Lines of this file are not shown. View the raw message.

net/bluetooth/hidp/core.c +1 -1
index 6724adce615b..3475e4b4c9b0 100644

Lines of this file are not shown. View the raw message.

net/bluetooth/rfcomm/core.c +2 -2
index 3b8f39618d65..420213530cb5 100644

Lines of this file are not shown. View the raw message.

net/bridge/br_mdb.c +7 -7
index 722203b98ff7..029062ffa0e2 100644

Lines of this file are not shown. View the raw message.

net/bridge/br_multicast.c +29 -29

58 lines not on this page · raw message

net/bridge/br_multicast_eht.c +3 -3
index 46c117615f04..1ca3b3d3cada 100644

Lines of this file are not shown. View the raw message.

net/bridge/br_stp.c +8 -8
index 024210f95468..c46dcbfea337 100644

Lines of this file are not shown. View the raw message.

net/bridge/br_stp_if.c +2 -2
index c20a41bf253b..a2198fdceb2c 100644

Lines of this file are not shown. View the raw message.

net/bridge/br_stp_timer.c +3 -3
index 8e283779a4cc..965801cbcf86 100644

Lines of this file are not shown. View the raw message.

net/can/af_can.c +1 -1
index 4aab7033c933..678ccf4bb3c2 100644

Lines of this file are not shown. View the raw message.

net/can/proc.c +1 -1
index 0938bf7dd646..181c85c6242a 100644

Lines of this file are not shown. View the raw message.

net/core/drop_monitor.c +2 -2
index 046764ec42de..8073966148d6 100644

Lines of this file are not shown. View the raw message.

net/core/gen_estimator.c +2 -2
index 7d426a8e29f3..170ca0cc681a 100644

Lines of this file are not shown. View the raw message.

net/core/neighbour.c +4 -4
index fed79161f41f..392ca515433d 100644

Lines of this file are not shown. View the raw message.

net/core/sock.c +1 -1
index e54449c9ab0b..f694cf024d4e 100644

Lines of this file are not shown. View the raw message.

net/hsr/hsr_device.c +6 -6
index 523b60efd639..bdb31e4a20f1 100644

Lines of this file are not shown. View the raw message.

net/hsr/hsr_framereg.c +2 -2
index 3a2a2fa7a0a3..e56b35ca1839 100644

Lines of this file are not shown. View the raw message.

net/ipv4/igmp.c +3 -3
index ab1084be3ce7..354a3b8c7226 100644

Lines of this file are not shown. View the raw message.

net/ipv4/inet_connection_sock.c +2 -2
index c437a1c2c6ac..7b09658a52c1 100644

Lines of this file are not shown. View the raw message.

net/ipv4/inet_fragment.c +1 -1
index 470ab17ceb51..f28fed049f92 100644

Lines of this file are not shown. View the raw message.

net/ipv4/inet_timewait_sock.c +2 -2
index 663a4a915a54..1a9c31ee31ca 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_fragment.c +1 -1
index 64b3fb3208af..a2ebdca25ae4 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ipmr.c +3 -3
index 5f1c7adf6680..bcf41da0bb10 100644

Lines of this file are not shown. View the raw message.

net/ipv4/tcp.c +2 -2
index 6edc441b3702..1869b8525571 100644

Lines of this file are not shown. View the raw message.

net/ipv6/addrconf.c +1 -1
index 39cfe7a8c2bc..278ec87b5b54 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6_fib.c +4 -4
index 5216b8b6314a..0ec008408ee6 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6_flowlabel.c +2 -2
index a3ff575798dd..272dbeb30eb9 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6mr.c +2 -2
index 93eff77c621a..b99622044c3c 100644

Lines of this file are not shown. View the raw message.

net/llc/llc_c_ac.c +6 -6
index 8be393ccfc22..384d6bce2cac 100644

Lines of this file are not shown. View the raw message.

net/mac80211/agg-rx.c +2 -2
index e1d9e02f752b..db4e60239e5c 100644

Lines of this file are not shown. View the raw message.

net/mac80211/agg-tx.c +3 -3
index a99b3868fea7..068de82f2c76 100644

Lines of this file are not shown. View the raw message.

net/mac80211/ibss.c +3 -3
index 86ef9a858eb4..f30c3b754171 100644

Lines of this file are not shown. View the raw message.

net/mac80211/led.c +2 -2
index 2e10136b3e70..08348bbffbc1 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mesh.c +2 -2
index b17f5b75d699..7c9556c249d6 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mesh_hwmp.c +2 -2
index 2666ee263731..7f191efa4588 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mesh_plink.c +2 -2
index 4fe05d640953..c86c86e2c58f 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mlme.c +9 -9
index 04f29c89bfb6..c5eb6cb0ee8c 100644

Lines of this file are not shown. View the raw message.

net/mac80211/ocb.c +1 -1
index a5d4358f122a..ca9953743670 100644

Lines of this file are not shown. View the raw message.

net/mac80211/offchannel.c +1 -1
index 2b9abc27462e..4c6ee78003b9 100644

Lines of this file are not shown. View the raw message.

net/mac80211/rx.c +3 -3
index 09beb65d6108..6eb19d8e68e9 100644

Lines of this file are not shown. View the raw message.

net/mac80211/sta_info.c +1 -1
index 02de319b45db..c55fb324df77 100644

Lines of this file are not shown. View the raw message.

net/mac80211/status.c +2 -2
index b17b3cc7fb90..170949770eb6 100644

Lines of this file are not shown. View the raw message.

net/mac80211/tx.c +2 -2
index 20179db88c4a..6449993c5bed 100644

Lines of this file are not shown. View the raw message.

net/mac80211/util.c +1 -1
index dec6e16b8c7d..dba2a85a67ab 100644

Lines of this file are not shown. View the raw message.

net/mctp/af_mctp.c +1 -1
index dd895617defd..763e28c1ae5f 100644

Lines of this file are not shown. View the raw message.

net/ncsi/ncsi-cmd.c +1 -1
index b3ff37a181d7..e87cc6dbb314 100644

Lines of this file are not shown. View the raw message.

net/ncsi/ncsi-manage.c +2 -2
index 446e4e3b9553..a3ae351f5995 100644

Lines of this file are not shown. View the raw message.

net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
index b6be18037f30..b1e5bf4a771b 100644

Lines of this file are not shown. View the raw message.

net/netfilter/ipset/ip_set_list_set.c +1 -1
index dc45021a784a..d0259d9ff723 100644

Lines of this file are not shown. View the raw message.

net/netfilter/ipvs/ip_vs_conn.c +1 -1
index 6e13e8dba00b..0804f2fdf8c0 100644

Lines of this file are not shown. View the raw message.

net/netfilter/ipvs/ip_vs_ctl.c +2 -2
index fdc8ef0a0db2..0ef1a0a9745e 100644

Lines of this file are not shown. View the raw message.

net/netfilter/ipvs/ip_vs_lblc.c +2 -2
index f15377c4c5df..97922fa88459 100644

Lines of this file are not shown. View the raw message.

net/netfilter/ipvs/ip_vs_lblcr.c +2 -2
index 7efaf82090fd..b4a168098bc2 100644

Lines of this file are not shown. View the raw message.

net/netfilter/xt_IDLETIMER.c +6 -6
index 7f20e517da62..2b0cbaac00e2 100644

Lines of this file are not shown. View the raw message.

net/netfilter/xt_LED.c +1 -1
index 3dd733b293fe..69e628d9b186 100644

Lines of this file are not shown. View the raw message.

net/netrom/nr_loopback.c +2 -2
index 7a9d765b30c0..b3d4d892c265 100644

Lines of this file are not shown. View the raw message.

net/nfc/core.c +3 -3
index ae1c842f9c64..8009b40569a5 100644

Lines of this file are not shown. View the raw message.

net/nfc/hci/core.c +1 -1
index 8618d57c23da..0794c4f9ed3b 100644

Lines of this file are not shown. View the raw message.

net/nfc/hci/llc_shdlc.c +4 -4
index 4fc37894860c..8d3fbacb1974 100644

Lines of this file are not shown. View the raw message.

net/nfc/llcp_commands.c +1 -1
index e2680a3bef79..009889c19054 100644

Lines of this file are not shown. View the raw message.

net/nfc/llcp_core.c +3 -3
index 73282f5f6d83..81d224d18765 100644

Lines of this file are not shown. View the raw message.

net/nfc/nci/core.c +2 -2
index fc921cd2cdff..5d5291a488f6 100644

Lines of this file are not shown. View the raw message.

net/packet/af_packet.c +1 -1
index bafc1ee7ccfa..a590af9fda20 100644

Lines of this file are not shown. View the raw message.

net/rose/rose_loopback.c +2 -2
index b538e39b3df5..393a485ba137 100644

Lines of this file are not shown. View the raw message.

net/sched/cls_flow.c +2 -2
index 5693b41b093f..437ca8165db0 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_fq_pie.c +2 -2
index 98f8765ec5d4..aa7b95470aeb 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_generic.c +2 -2
index a78945a7073a..f45c6401e70b 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_pie.c +2 -2
index d5caa6d5cd5b..27c2257c0dec 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_red.c +2 -2
index 339d70b4a4c5..a26487cd4bfc 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_sfq.c +2 -2
index a8081492d671..ff15b69b633f 100644

Lines of this file are not shown. View the raw message.

net/sctp/associola.c +1 -1
index 760152e751c7..36228d4d6086 100644

Lines of this file are not shown. View the raw message.

net/sctp/input.c +1 -1
index 0c0d2757f6f8..7a8a42dbac2e 100644

Lines of this file are not shown. View the raw message.

net/sctp/output.c +1 -1
index 23e96305cad7..1e40dc92bb73 100644

Lines of this file are not shown. View the raw message.

net/sctp/outqueue.c +1 -1
index f6b8c13dafa4..6d1e30f95a50 100644

Lines of this file are not shown. View the raw message.

net/sctp/protocol.c +2 -2
index f402f90eb6b6..f4fdfbbfa458 100644

Lines of this file are not shown. View the raw message.

net/sctp/sm_sideeffect.c +8 -8
index d16c244fc451..77ce098df7bf 100644

Lines of this file are not shown. View the raw message.

net/sctp/transport.c +6 -6
index 6946c1462793..1fa755fab02c 100644

Lines of this file are not shown. View the raw message.

net/sunrpc/svc_xprt.c +3 -3
index 144fdc4cd322..6829ff25058f 100644

Lines of this file are not shown. View the raw message.

net/sunrpc/xprt.c +2 -2
index 002380569762..35f4b7eb3955 100644

Lines of this file are not shown. View the raw message.

net/tipc/discover.c +5 -5
index 775fd4f3f072..c8182ef47612 100644

Lines of this file are not shown. View the raw message.

net/tipc/monitor.c +2 -2
index 2f266a064663..ef85aba043ee 100644

Lines of this file are not shown. View the raw message.

net/tipc/node.c +3 -3
index 32afc0bdfd0c..49cfe22a2e6b 100644

Lines of this file are not shown. View the raw message.

net/tipc/subscr.c +1 -1
index f8490d94e323..d364c87b2533 100644

Lines of this file are not shown. View the raw message.

net/wireless/core.c +1 -1
index 5c3c72df0591..2f17deae8ae4 100644

Lines of this file are not shown. View the raw message.

net/x25/x25_link.c +1 -1
index 4608aa5b4f31..f1855563db23 100644

Lines of this file are not shown. View the raw message.

net/x25/x25_timer.c +5 -5
index 2ec63a1f4c6d..895627a77938 100644

Lines of this file are not shown. View the raw message.

net/xfrm/xfrm_policy.c +5 -5
index 59d0bd5e80ec..d67da0ee44a4 100644

Lines of this file are not shown. View the raw message.

net/xfrm/xfrm_replay.c +3 -3
index dbdf8a39dffe..737574b55a87 100644

Lines of this file are not shown. View the raw message.

net/xfrm/xfrm_state.c +1 -1
index 767ec3681de4..19a62ad5ee4e 100644

Lines of this file are not shown. View the raw message.

samples/connector/cn_test.c +2 -2
index 73d50b4aebb6..2f20e1feb5c7 100644

Lines of this file are not shown. View the raw message.

samples/ftrace/sample-trace-array.c +1 -1
index 0e0e0628cead..5620399aea10 100644

Lines of this file are not shown. View the raw message.

security/keys/gc.c +1 -1
index f27223ea4578..e7d77194ea32 100644

Lines of this file are not shown. View the raw message.

sound/core/timer.c +1 -1
index 5bf5bddfd82a..7885583e5737 100644

Lines of this file are not shown. View the raw message.

sound/drivers/aloop.c +1 -1
index 6c318a5903ab..b5d41bad0952 100644

Lines of this file are not shown. View the raw message.

sound/drivers/dummy.c +1 -1
index 783fe3a22bc9..dc191a26920e 100644

Lines of this file are not shown. View the raw message.

sound/drivers/mpu401/mpu401_uart.c +2 -2
index 670f8ba92c08..e4d9a9f22342 100644

Lines of this file are not shown. View the raw message.

sound/drivers/mtpav.c +2 -2
index 851f34e2cdd0..c7297cf18194 100644

Lines of this file are not shown. View the raw message.

sound/drivers/opl3/opl3_midi.c +2 -2
index de7449cb6515..e7bdb418e2e3 100644

Lines of this file are not shown. View the raw message.

sound/drivers/pcmtest.c +2 -2
index 39f1e1fe4c44..da68ba907de1 100644

Lines of this file are not shown. View the raw message.

sound/drivers/serial-u16550.c +1 -1
index 6d0656fcd574..b98682cd26a8 100644

Lines of this file are not shown. View the raw message.

sound/i2c/other/ak4117.c +2 -2
index cd380db195ef..4f0b87914d89 100644

Lines of this file are not shown. View the raw message.

sound/isa/sb/emu8000_pcm.c +2 -2
index 215bbcd0360e..60e39870bdf4 100644

Lines of this file are not shown. View the raw message.

sound/isa/sb/sb8_midi.c +2 -2
index 25caf23273bc..9401c90f4aec 100644

Lines of this file are not shown. View the raw message.

sound/isa/wavefront/wavefront_midi.c +2 -2
index 494b21be665c..0146a18226bc 100644

Lines of this file are not shown. View the raw message.

sound/pci/asihpi/asihpi.c +1 -1
index 3fba8f3a90ec..6c4139cbb440 100644

Lines of this file are not shown. View the raw message.

sound/pci/ctxfi/cttimer.c +2 -2
index fa6867adb42b..47571889fc8b 100644

Lines of this file are not shown. View the raw message.

sound/pci/echoaudio/midi.c +1 -1
index c3f3c9129561..c4d2ca269ec8 100644

Lines of this file are not shown. View the raw message.

sound/pci/korg1212/korg1212.c +2 -2
index aef44a88d545..6db44cf776b6 100644

Lines of this file are not shown. View the raw message.

sound/pci/rme9652/hdsp.c +2 -2
index e4b059000def..a78e2ad6d0c5 100644

Lines of this file are not shown. View the raw message.

sound/pci/rme9652/hdspm.c +2 -2
index bcf068e95fda..3751570c8d69 100644

Lines of this file are not shown. View the raw message.

sound/sh/aica.c +3 -3
index b0f8f1d083e0..6b41c70e550d 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/rt5645.c +1 -1
index 7d1d8773c76d..4900f326c53d 100644

Lines of this file are not shown. View the raw message.

sound/soc/fsl/imx-pcm-rpmsg.c +1 -1
index ea445a6191ed..5571a92c0daa 100644

Lines of this file are not shown. View the raw message.

sound/soc/ti/ams-delta.c +1 -1
index 9b8cb80ec81a..c9b36f09eca1 100644

Lines of this file are not shown. View the raw message.

sound/synth/emux/emux_synth.c +2 -2
index cff6aba9bfc3..c6562c386ba1 100644

Lines of this file are not shown. View the raw message.

sound/usb/midi.c +2 -2
index a231b3f51f90..a0c49be32df6 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.45.2

Part of the diff is not shown here. View the raw message.

#20 lore raw

PATCH 11/17 treewide, timers: Rename destroy_timer_on_stack() => timer_destroy_on_stack()

In reply to Ingo Molnar

Move this API to the canonical timer_*() namespace.

---
 drivers/base/power/main.c                     | 2 +-
 drivers/char/random.c                         | 2 +-
 drivers/dma-buf/st-dma-fence.c                | 2 +-
 drivers/firewire/core-transaction.c           | 2 +-
 drivers/firmware/psci/psci_checker.c          | 2 +-
 drivers/gpu/drm/gud/gud_pipe.c                | 2 +-
 drivers/gpu/drm/i915/gt/selftest_migrate.c    | 2 +-
 drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 2 +-
 drivers/gpu/drm/ttm/tests/ttm_bo_test.c       | 2 +-
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c       | 2 +-
 drivers/scsi/megaraid/megaraid_mbox.c         | 2 +-
 drivers/scsi/megaraid/megaraid_mm.c           | 2 +-
 drivers/staging/gpib/common/iblib.c           | 2 +-
 drivers/usb/atm/cxacru.c                      | 2 +-
 drivers/usb/misc/usbtest.c                    | 2 +-
 fs/bcachefs/clock.c                           | 2 +-
 include/linux/timer.h                         | 6 +++---
 kernel/kcsan/kcsan_test.c                     | 2 +-
 kernel/rcu/rcutorture.c                       | 2 +-
 kernel/time/sleep_timeout.c                   | 2 +-
 kernel/time/timer.c                           | 4 ++--
 kernel/workqueue.c                            | 2 +-
 22 files changed, 25 insertions(+), 25 deletions(-)
drivers/base/power/main.c +1 -1
index 5d840dce3a23..d0a1ea4818b9 100644
@@ -560,7 +560,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd)
 	struct timer_list *timer = &wd->timer;
 
 	timer_delete_sync(timer);
-	destroy_timer_on_stack(timer);
+	timer_destroy_on_stack(timer);
 }
 #else
 #define DECLARE_DPM_WATCHDOG_ON_STACK(wd)
drivers/char/random.c +1 -1
index 225810db7d6f..4aa582072d68 100644
@@ -1353,7 +1353,7 @@ static void __cold try_to_generate_entropy(void)
 	mix_pool_bytes(&stack->entropy, sizeof(stack->entropy));
 
 	timer_delete_sync(&stack->timer);
-	destroy_timer_on_stack(&stack->timer);
+	timer_destroy_on_stack(&stack->timer);
 }
 
 
drivers/dma-buf/st-dma-fence.c +1 -1
index 0a4fe4c87c50..a8d3fafecf05 100644
@@ -413,7 +413,7 @@ static int test_wait_timeout(void *arg)
 	err = 0;
 err_free:
 	timer_delete_sync(&wt.timer);
-	destroy_timer_on_stack(&wt.timer);
+	timer_destroy_on_stack(&wt.timer);
 	dma_fence_signal(wt.f);
 	dma_fence_put(wt.f);
 	return err;
drivers/firewire/core-transaction.c +1 -1
index feddc7023c98..9c81ff15ba6f 100644
@@ -431,7 +431,7 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
 	fw_send_request(card, &t, tcode, destination_id, generation, speed,
 			offset, payload, length, transaction_callback, &d);
 	wait_for_completion(&d.done);
-	destroy_timer_on_stack(&t.split_timeout_timer);
+	timer_destroy_on_stack(&t.split_timeout_timer);
 
 	return d.rcode;
 }
drivers/firmware/psci/psci_checker.c +1 -1
index 66026728c73a..cbc8e9dd12b7 100644
@@ -343,7 +343,7 @@ static int suspend_test_thread(void *arg)
 	 * later.
 	 */
 	timer_delete(&wakeup_timer);
-	destroy_timer_on_stack(&wakeup_timer);
+	timer_destroy_on_stack(&wakeup_timer);
 
 	if (atomic_dec_return_relaxed(&nb_active_threads) == 0)
 		complete(&suspend_threads_done);
drivers/gpu/drm/gud/gud_pipe.c +1 -1
index 31d2b04b0b91..601624e9c456 100644
@@ -261,7 +261,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)
 	else if (ctx.sgr.bytes != len)
 		ret = -EIO;
 
-	destroy_timer_on_stack(&ctx.timer);
+	timer_destroy_on_stack(&ctx.timer);
 
 	return ret;
 }
drivers/gpu/drm/i915/gt/selftest_migrate.c +1 -1
index 8b1261bfdd4f..598566df7e19 100644
@@ -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:
drivers/gpu/drm/i915/selftests/lib_sw_fence.c +1 -1
index 7b32188f6572..710cab37274f 100644
@@ -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);
 }
 
drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1 -1
index 60f8c3f52619..1a1815e52e4a 100644
@@ -201,7 +201,7 @@ static int threaded_ttm_bo_reserve(void *arg)
 	err = ttm_bo_reserve(bo, interruptible, no_wait, &ctx);
 
 	timer_delete_sync(&s_timer.timer);
-	destroy_timer_on_stack(&s_timer.timer);
+	timer_destroy_on_stack(&s_timer.timer);
 
 	ww_acquire_fini(&ctx);
 
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +1 -1
index a8ccb5898a80..d23e503d0dda 100644
@@ -3806,7 +3806,7 @@ status);
 	if ((status < 0) && (!probe_fl)) {
 		pvr2_hdw_render_useless(hdw);
 	}
-	destroy_timer_on_stack(&timer.timer);
+	timer_destroy_on_stack(&timer.timer);
 
 	return status;
 }
drivers/scsi/megaraid/megaraid_mbox.c +1 -1
index 7740daa94313..26245fd22c9f 100644
@@ -3952,7 +3952,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter)
 
 
 	timer_delete_sync(&timeout.timer);
-	destroy_timer_on_stack(&timeout.timer);
+	timer_destroy_on_stack(&timeout.timer);
 
 	mutex_unlock(&raid_dev->sysfs_mtx);
 
drivers/scsi/megaraid/megaraid_mm.c +1 -1
index 38dc22f8c8cd..ab994053b2a6 100644
@@ -704,7 +704,7 @@ lld_ioctl(mraid_mmadp_t *adp, uioc_t *kioc)
 	wait_event(wait_q, (kioc->status != -ENODATA));
 	if (timeout.timer.function) {
 		timer_delete_sync(&timeout.timer);
-		destroy_timer_on_stack(&timeout.timer);
+		timer_destroy_on_stack(&timeout.timer);
 	}
 
 	/*
drivers/staging/gpib/common/iblib.c +1 -1
index 5d9ef387edbb..a82b1fef5352 100644
@@ -611,7 +611,7 @@ static void start_wait_timer(struct wait_info *winfo)
 static void remove_wait_timer(struct wait_info *winfo)
 {
 	timer_delete_sync(&winfo->timer);
-	destroy_timer_on_stack(&winfo->timer);
+	timer_destroy_on_stack(&winfo->timer);
 }
 
 /*
drivers/usb/atm/cxacru.c +1 -1
index 2006a580061d..520e55324d13 100644
@@ -598,7 +598,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
 	timer_mod(&timer.timer, jiffies + msecs_to_jiffies(CMD_TIMEOUT));
 	wait_for_completion(done);
 	timer_delete_sync(&timer.timer);
-	destroy_timer_on_stack(&timer.timer);
+	timer_destroy_on_stack(&timer.timer);
 
 	if (actual_length)
 		*actual_length = urb->actual_length;
drivers/usb/misc/usbtest.c +1 -1
index 2cf7bad70f39..d982ff6e37b2 100644
@@ -630,7 +630,7 @@ static int perform_sglist(
 			retval = -ETIMEDOUT;
 		else
 			retval = req->status;
-		destroy_timer_on_stack(&timeout.timer);
+		timer_destroy_on_stack(&timeout.timer);
 
 		/* FIXME check resulting data pattern */
 
fs/bcachefs/clock.c +1 -1
index 1db45b9714ca..aa8620d337a2 100644
@@ -122,7 +122,7 @@ void bch2_kthread_io_clock_wait(struct io_clock *clock,
 
 	__set_current_state(TASK_RUNNING);
 	timer_delete_sync(&wait.cpu_timer);
-	destroy_timer_on_stack(&wait.cpu_timer);
+	timer_destroy_on_stack(&wait.cpu_timer);
 	bch2_io_timer_del(clock, &wait.io_timer);
 }
 
include/linux/timer.h +3 -3
index b3d2ab87c248..ae00a9f618ad 100644
@@ -115,7 +115,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
  *
  * Regular timer initialization should use either DEFINE_TIMER() above,
  * or timer_setup(). For timers on the stack, timer_setup_on_stack() must
- * be used and must be balanced with a call to destroy_timer_on_stack().
+ * be used and must be balanced with a call to timer_destroy_on_stack().
  */
 #define timer_setup(timer, callback, flags)			\
 	__init_timer((timer), (callback), (flags))
@@ -124,9 +124,9 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
 	__init_timer_on_stack((timer), (callback), (flags))
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
-extern void destroy_timer_on_stack(struct timer_list *timer);
+extern void timer_destroy_on_stack(struct timer_list *timer);
 #else
-static inline void destroy_timer_on_stack(struct timer_list *timer) { }
+static inline void timer_destroy_on_stack(struct timer_list *timer) { }
 #endif
 
 #define timer_container_of(var, callback_timer, timer_fieldname) \
kernel/kcsan/kcsan_test.c +1 -1
index ef4ea881ba96..9ca22cea56db 100644
@@ -1501,7 +1501,7 @@ static int access_thread(void *arg)
 		}
 	} while (!torture_must_stop());
 	timer_delete_sync(&timer);
-	destroy_timer_on_stack(&timer);
+	timer_destroy_on_stack(&timer);
 
 	torture_kthread_stopping("access_thread");
 	return 0;
kernel/rcu/rcutorture.c +1 -1
index d630df4372ec..61c27f9c3155 100644
@@ -2325,7 +2325,7 @@ rcu_torture_reader(void *arg)
 	} while (!torture_must_stop());
 	if (irqreader && cur_ops->irq_capable) {
 		timer_delete_sync(&t);
-		destroy_timer_on_stack(&t);
+		timer_destroy_on_stack(&t);
 	}
 	tick_dep_clear_task(current, TICK_DEP_BIT_RCU);
 	torture_kthread_stopping("rcu_torture_reader");
kernel/time/sleep_timeout.c +1 -1
index 0745d2148150..2e20f9c549ee 100644
@@ -100,7 +100,7 @@ signed long __sched schedule_timeout(signed long timeout)
 	timer_delete_sync(&timer.timer);
 
 	/* Remove the timer from the object tracker */
-	destroy_timer_on_stack(&timer.timer);
+	timer_destroy_on_stack(&timer.timer);
 
 	timeout = expire - jiffies;
 
kernel/time/timer.c +2 -2
index c5f5d9fc854f..08780e06c7cf 100644
@@ -860,11 +860,11 @@ void init_timer_on_stack_key(struct timer_list *timer,
 }
 EXPORT_SYMBOL_GPL(init_timer_on_stack_key);
 
-void destroy_timer_on_stack(struct timer_list *timer)
+void timer_destroy_on_stack(struct timer_list *timer)
 {
 	debug_object_free(timer, &timer_debug_descr);
 }
-EXPORT_SYMBOL_GPL(destroy_timer_on_stack);
+EXPORT_SYMBOL_GPL(timer_destroy_on_stack);
 
 #else
 static inline void debug_timer_init(struct timer_list *timer) { }
kernel/workqueue.c +1 -1
index e4860d6ea594..a6c83789c721 100644
@@ -686,7 +686,7 @@ EXPORT_SYMBOL_GPL(destroy_work_on_stack);
 
 void destroy_delayed_work_on_stack(struct delayed_work *work)
 {
-	destroy_timer_on_stack(&work->timer);
+	timer_destroy_on_stack(&work->timer);
 	debug_object_free(&work->work, &work_debug_descr);
 }
 EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack);
Signature · 1 line
2.45.2
#21 lore raw

PATCH 12/17 treewide, timers: Rename init_timer_key() => timer_init_key()

In reply to Ingo Molnar

Move this API to the canonical timer_*() namespace.

---
 include/linux/timer.h | 8 ++++----
 kernel/time/timer.c   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
include/linux/timer.h +4 -4
index ae00a9f618ad..18c5afa293e7 100644
@@ -67,7 +67,7 @@
 /*
  * LOCKDEP and DEBUG timer interfaces.
  */
-void init_timer_key(struct timer_list *timer,
+void timer_init_key(struct timer_list *timer,
 		    void (*func)(struct timer_list *), unsigned int flags,
 		    const char *name, struct lock_class_key *key);
 
@@ -83,7 +83,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
 					   const char *name,
 					   struct lock_class_key *key)
 {
-	init_timer_key(timer, func, flags, name, key);
+	timer_init_key(timer, func, flags, name, key);
 }
 #endif
 
@@ -91,7 +91,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
 #define __init_timer(_timer, _fn, _flags)				\
 	do {								\
 		static struct lock_class_key __key;			\
-		init_timer_key((_timer), (_fn), (_flags), #_timer, &__key);\
+		timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
 	} while (0)
 
 #define __init_timer_on_stack(_timer, _fn, _flags)			\
@@ -102,7 +102,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
 	} while (0)
 #else
 #define __init_timer(_timer, _fn, _flags)				\
-	init_timer_key((_timer), (_fn), (_flags), NULL, NULL)
+	timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
 #define __init_timer_on_stack(_timer, _fn, _flags)			\
 	init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)
 #endif
kernel/time/timer.c +4 -4
index 08780e06c7cf..013173fee6c6 100644
@@ -904,7 +904,7 @@ static void do_init_timer(struct timer_list *timer,
 }
 
 /**
- * init_timer_key - initialize a timer
+ * timer_init_key - initialize a timer
  * @timer: the timer to be initialized
  * @func: timer callback function
  * @flags: timer flags
@@ -912,17 +912,17 @@ static void do_init_timer(struct timer_list *timer,
  * @key: lockdep class key of the fake lock used for tracking timer
  *       sync lock dependencies
  *
- * init_timer_key() must be done to a timer prior to calling *any* of the
+ * timer_init_key() must be done to a timer prior to calling *any* of the
  * other timer functions.
  */
-void init_timer_key(struct timer_list *timer,
+void timer_init_key(struct timer_list *timer,
 		    void (*func)(struct timer_list *), unsigned int flags,
 		    const char *name, struct lock_class_key *key)
 {
 	debug_init(timer);
 	do_init_timer(timer, func, flags, name, key);
 }
-EXPORT_SYMBOL(init_timer_key);
+EXPORT_SYMBOL(timer_init_key);
 
 static inline void detach_timer(struct timer_list *timer, bool clear_pending)
 {
Signature · 1 line
2.45.2
#22 lore raw

PATCH 13/17 treewide, timers: Rename init_timer_on_stack_key() => timer_init_on_stack_key()

In reply to Ingo Molnar

Move this API to the canonical timer_*() namespace.

---
 include/linux/timer.h | 8 ++++----
 kernel/time/timer.c   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
include/linux/timer.h +4 -4
index 18c5afa293e7..33dbd670820e 100644
@@ -72,12 +72,12 @@ void timer_init_key(struct timer_list *timer,
 		    const char *name, struct lock_class_key *key);
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
-extern void init_timer_on_stack_key(struct timer_list *timer,
+extern void timer_init_on_stack_key(struct timer_list *timer,
 				    void (*func)(struct timer_list *),
 				    unsigned int flags, const char *name,
 				    struct lock_class_key *key);
 #else
-static inline void init_timer_on_stack_key(struct timer_list *timer,
+static inline void timer_init_on_stack_key(struct timer_list *timer,
 					   void (*func)(struct timer_list *),
 					   unsigned int flags,
 					   const char *name,
@@ -97,14 +97,14 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
 #define __init_timer_on_stack(_timer, _fn, _flags)			\
 	do {								\
 		static struct lock_class_key __key;			\
-		init_timer_on_stack_key((_timer), (_fn), (_flags),	\
+		timer_init_on_stack_key((_timer), (_fn), (_flags),	\
 					#_timer, &__key);		 \
 	} while (0)
 #else
 #define __init_timer(_timer, _fn, _flags)				\
 	timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
 #define __init_timer_on_stack(_timer, _fn, _flags)			\
-	init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)
+	timer_init_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)
 #endif
 
 /**
kernel/time/timer.c +2 -2
index 013173fee6c6..2ea735fa47fb 100644
@@ -850,7 +850,7 @@ static void do_init_timer(struct timer_list *timer,
 			  unsigned int flags,
 			  const char *name, struct lock_class_key *key);
 
-void init_timer_on_stack_key(struct timer_list *timer,
+void timer_init_on_stack_key(struct timer_list *timer,
 			     void (*func)(struct timer_list *),
 			     unsigned int flags,
 			     const char *name, struct lock_class_key *key)
@@ -858,7 +858,7 @@ void init_timer_on_stack_key(struct timer_list *timer,
 	debug_object_init_on_stack(timer, &timer_debug_descr);
 	do_init_timer(timer, func, flags, name, key);
 }
-EXPORT_SYMBOL_GPL(init_timer_on_stack_key);
+EXPORT_SYMBOL_GPL(timer_init_on_stack_key);
 
 void timer_destroy_on_stack(struct timer_list *timer)
 {
Signature · 1 line
2.45.2
#23 lore raw

PATCH 14/17 treewide, timers: Rename __init_timer() => __timer_init()

In reply to Ingo Molnar

Move this API to the canonical __timer_*() namespace.

---
 include/linux/timer.h     | 6 +++---
 include/linux/workqueue.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/timer.h +3 -3
index 33dbd670820e..149dfb1f75fa 100644
@@ -88,7 +88,7 @@ static inline void timer_init_on_stack_key(struct timer_list *timer,
 #endif
 
 #ifdef CONFIG_LOCKDEP
-#define __init_timer(_timer, _fn, _flags)				\
+#define __timer_init(_timer, _fn, _flags)				\
 	do {								\
 		static struct lock_class_key __key;			\
 		timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
@@ -101,7 +101,7 @@ static inline void timer_init_on_stack_key(struct timer_list *timer,
 					#_timer, &__key);		 \
 	} while (0)
 #else
-#define __init_timer(_timer, _fn, _flags)				\
+#define __timer_init(_timer, _fn, _flags)				\
 	timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
 #define __init_timer_on_stack(_timer, _fn, _flags)			\
 	timer_init_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)
@@ -118,7 +118,7 @@ static inline void timer_init_on_stack_key(struct timer_list *timer,
  * be used and must be balanced with a call to timer_destroy_on_stack().
  */
 #define timer_setup(timer, callback, flags)			\
-	__init_timer((timer), (callback), (flags))
+	__timer_init((timer), (callback), (flags))
 
 #define timer_setup_on_stack(timer, callback, flags)		\
 	__init_timer_on_stack((timer), (callback), (flags))
include/linux/workqueue.h +1 -1
index b0dc957c3e56..985f69f8fb99 100644
@@ -316,7 +316,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
 #define __INIT_DELAYED_WORK(_work, _func, _tflags)			\
 	do {								\
 		INIT_WORK(&(_work)->work, (_func));			\
-		__init_timer(&(_work)->timer,				\
+		__timer_init(&(_work)->timer,				\
 			     delayed_work_timer_fn,			\
 			     (_tflags) | TIMER_IRQSAFE);		\
 	} while (0)
Signature · 1 line
2.45.2
#24 lore raw

PATCH 15/17 treewide, timers: Rename __init_timer_on_stack() => __timer_init_on_stack()

In reply to Ingo Molnar

Move this API to the canonical __timer_*() namespace.

---
 include/linux/timer.h     | 6 +++---
 include/linux/workqueue.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/timer.h +3 -3
index 149dfb1f75fa..0f0531e827c4 100644
@@ -94,7 +94,7 @@ static inline void timer_init_on_stack_key(struct timer_list *timer,
 		timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
 	} while (0)
 
-#define __init_timer_on_stack(_timer, _fn, _flags)			\
+#define __timer_init_on_stack(_timer, _fn, _flags)			\
 	do {								\
 		static struct lock_class_key __key;			\
 		timer_init_on_stack_key((_timer), (_fn), (_flags),	\
@@ -103,7 +103,7 @@ static inline void timer_init_on_stack_key(struct timer_list *timer,
 #else
 #define __timer_init(_timer, _fn, _flags)				\
 	timer_init_key((_timer), (_fn), (_flags), NULL, NULL)
-#define __init_timer_on_stack(_timer, _fn, _flags)			\
+#define __timer_init_on_stack(_timer, _fn, _flags)			\
 	timer_init_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)
 #endif
 
@@ -121,7 +121,7 @@ static inline void timer_init_on_stack_key(struct timer_list *timer,
 	__timer_init((timer), (callback), (flags))
 
 #define timer_setup_on_stack(timer, callback, flags)		\
-	__init_timer_on_stack((timer), (callback), (flags))
+	__timer_init_on_stack((timer), (callback), (flags))
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
 extern void timer_destroy_on_stack(struct timer_list *timer);
include/linux/workqueue.h +1 -1
index 985f69f8fb99..c84da78878d9 100644
@@ -324,7 +324,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }
 #define __INIT_DELAYED_WORK_ONSTACK(_work, _func, _tflags)		\
 	do {								\
 		INIT_WORK_ONSTACK(&(_work)->work, (_func));		\
-		__init_timer_on_stack(&(_work)->timer,			\
+		__timer_init_on_stack(&(_work)->timer,			\
 				      delayed_work_timer_fn,		\
 				      (_tflags) | TIMER_IRQSAFE);	\
 	} while (0)
Signature · 1 line
2.45.2
#25 lore raw

PATCH 16/17 treewide, timers: Rename NEXT_TIMER_MAX_DELTA => TIMER_NEXT_MAX_DELTA

In reply to Ingo Molnar

Move this macro to the canonical TIMER_* namespace.

---
 arch/powerpc/kvm/booke.c |  8 ++++----
 include/linux/timer.h    |  2 +-
 kernel/time/timer.c      | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)
arch/powerpc/kvm/booke.c +4 -4
index 5322a9dea19d..71ffbf917dae 100644
@@ -572,7 +572,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
 
 /*
  * Return the number of jiffies until the next timeout.  If the timeout is
- * longer than the NEXT_TIMER_MAX_DELTA, then return NEXT_TIMER_MAX_DELTA
+ * longer than the TIMER_NEXT_MAX_DELTA, then return TIMER_NEXT_MAX_DELTA
  * because the larger value can break the timer APIs.
  */
 static unsigned long watchdog_next_timeout(struct kvm_vcpu *vcpu)
@@ -598,7 +598,7 @@ static unsigned long watchdog_next_timeout(struct kvm_vcpu *vcpu)
 	if (do_div(nr_jiffies, tb_ticks_per_jiffy))
 		nr_jiffies++;
 
-	return min_t(unsigned long long, nr_jiffies, NEXT_TIMER_MAX_DELTA);
+	return min_t(unsigned long long, nr_jiffies, TIMER_NEXT_MAX_DELTA);
 }
 
 static void arm_next_watchdog(struct kvm_vcpu *vcpu)
@@ -616,10 +616,10 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu)
 	spin_lock_irqsave(&vcpu->arch.wdt_lock, flags);
 	nr_jiffies = watchdog_next_timeout(vcpu);
 	/*
-	 * If the number of jiffies of watchdog timer >= NEXT_TIMER_MAX_DELTA
+	 * If the number of jiffies of watchdog timer >= TIMER_NEXT_MAX_DELTA
 	 * then do not run the watchdog timer as this can break timer APIs.
 	 */
-	if (nr_jiffies < NEXT_TIMER_MAX_DELTA)
+	if (nr_jiffies < TIMER_NEXT_MAX_DELTA)
 		timer_mod(&vcpu->arch.wdt_timer, jiffies + nr_jiffies);
 	else
 		timer_delete(&vcpu->arch.wdt_timer);
include/linux/timer.h +1 -1
index 0f0531e827c4..dcc791bf84a4 100644
@@ -156,7 +156,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);
  * The jiffies value which is added to now, when there is no timer
  * in the timer wheel:
  */
-#define NEXT_TIMER_MAX_DELTA	((1UL << 30) - 1)
+#define TIMER_NEXT_MAX_DELTA	((1UL << 30) - 1)
 
 extern void timer_add(struct timer_list *timer);
 extern void timer_add_local(struct timer_list *timer);
kernel/time/timer.c +6 -6
index 2ea735fa47fb..cba4f1118263 100644
@@ -1900,7 +1900,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
 	unsigned long clk, next, adj;
 	unsigned lvl, offset = 0;
 
-	next = base->clk + NEXT_TIMER_MAX_DELTA;
+	next = base->clk + TIMER_NEXT_MAX_DELTA;
 	clk = base->clk;
 	for (lvl = 0; lvl < LVL_DEPTH; lvl++, offset += LVL_SIZE) {
 		int pos = next_pending_bucket(base, offset, clk & LVL_MASK);
@@ -1963,7 +1963,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
 
 	WRITE_ONCE(base->next_expiry, next);
 	base->next_expiry_recalc = false;
-	base->timers_pending = !(next == base->clk + NEXT_TIMER_MAX_DELTA);
+	base->timers_pending = !(next == base->clk + TIMER_NEXT_MAX_DELTA);
 }
 
 #ifdef CONFIG_NO_HZ_COMMON
@@ -2015,7 +2015,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,
 	 * easy comparable to find out which base holds the first pending timer.
 	 */
 	if (!base->timers_pending)
-		WRITE_ONCE(base->next_expiry, basej + NEXT_TIMER_MAX_DELTA);
+		WRITE_ONCE(base->next_expiry, basej + TIMER_NEXT_MAX_DELTA);
 
 	return base->next_expiry;
 }
@@ -2399,7 +2399,7 @@ static inline void __run_timers(struct timer_base *base)
 		 * timer at this clk are that all matching timers have been
 		 * dequeued or no timer has been queued since
 		 * base::next_expiry was set to base::clk +
-		 * NEXT_TIMER_MAX_DELTA.
+		 * TIMER_NEXT_MAX_DELTA.
 		 */
 		WARN_ON_ONCE(!levels && !base->next_expiry_recalc
 			     && base->timers_pending);
@@ -2544,7 +2544,7 @@ int timers_prepare_cpu(unsigned int cpu)
 	for (b = 0; b < NR_BASES; b++) {
 		base = per_cpu_ptr(&timer_bases[b], cpu);
 		base->clk = jiffies;
-		base->next_expiry = base->clk + NEXT_TIMER_MAX_DELTA;
+		base->next_expiry = base->clk + TIMER_NEXT_MAX_DELTA;
 		base->next_expiry_recalc = false;
 		base->timers_pending = false;
 		base->is_idle = false;
@@ -2599,7 +2599,7 @@ static void __init init_timer_cpu(int cpu)
 		base->cpu = cpu;
 		raw_spin_lock_init(&base->lock);
 		base->clk = jiffies;
-		base->next_expiry = base->clk + NEXT_TIMER_MAX_DELTA;
+		base->next_expiry = base->clk + TIMER_NEXT_MAX_DELTA;
 		timer_base_init_expiry_lock(base);
 	}
 }
Signature · 1 line
2.45.2
#26 lore raw

PATCH 17/17 treewide, timers: Rename init_timers() => timers_init()

In reply to Ingo Molnar

Move this API to the canonical timers_*() namespace.

---
 arch/sparc/kernel/irq.h         | 2 +-
 arch/sparc/kernel/leon_kernel.c | 2 +-
 arch/sparc/kernel/sun4d_irq.c   | 2 +-
 arch/sparc/kernel/sun4m_irq.c   | 2 +-
 arch/sparc/kernel/time_32.c     | 2 +-
 include/linux/timer.h           | 2 +-
 init/main.c                     | 2 +-
 kernel/time/timer.c             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
arch/sparc/kernel/irq.h +1 -1
index b02026ad6e34..07727cb9d9aa 100644
@@ -55,7 +55,7 @@ extern struct sun4m_irq_global __iomem *sun4m_irq_global;
  * specifics in their init functions.
  */
 struct sparc_config {
-	void (*init_timers)(void);
+	void (*timers_init)(void);
 	unsigned int (*build_device_irq)(struct platform_device *op,
 	                                 unsigned int real_irq);
 
arch/sparc/kernel/leon_kernel.c +1 -1
index a43cf794bb1e..9260227aa3b7 100644
@@ -500,7 +500,7 @@ void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu)
 
 void __init leon_init_IRQ(void)
 {
-	sparc_config.init_timers      = leon_init_timers;
+	sparc_config.timers_init      = leon_init_timers;
 	sparc_config.build_device_irq = _leon_build_device_irq;
 	sparc_config.clock_rate       = 1000000;
 	sparc_config.clear_clock_irq  = leon_clear_clock_irq;
arch/sparc/kernel/sun4d_irq.c +1 -1
index 9a137c70e8d1..0032ffae0229 100644
@@ -509,7 +509,7 @@ void __init sun4d_init_IRQ(void)
 {
 	local_irq_disable();
 
-	sparc_config.init_timers      = sun4d_init_timers;
+	sparc_config.timers_init      = sun4d_init_timers;
 	sparc_config.build_device_irq = sun4d_build_device_irq;
 	sparc_config.clock_rate       = SBUS_CLOCK_RATE;
 	sparc_config.clear_clock_irq  = sun4d_clear_clock_irq;
arch/sparc/kernel/sun4m_irq.c +1 -1
index 1079638986b5..fbbdd7ca2511 100644
@@ -467,7 +467,7 @@ void __init sun4m_init_IRQ(void)
 	if (num_cpu_iregs == 4)
 		sbus_writel(0, &sun4m_irq_global->interrupt_target);
 
-	sparc_config.init_timers      = sun4m_init_timers;
+	sparc_config.timers_init      = sun4m_init_timers;
 	sparc_config.build_device_irq = sun4m_build_device_irq;
 	sparc_config.clock_rate       = SBUS_CLOCK_RATE;
 	sparc_config.clear_clock_irq  = sun4m_clear_clock_irq;
arch/sparc/kernel/time_32.c +1 -1
index 578fd0d49f30..1f83ca84ba2f 100644
@@ -340,7 +340,7 @@ static void __init sparc32_late_time_init(void)
 static void __init sbus_time_init(void)
 {
 	sparc_config.get_cycles_offset = sbus_cycles_offset;
-	sparc_config.init_timers();
+	sparc_config.timers_init();
 }
 
 void __init time_init(void)
include/linux/timer.h +1 -1
index dcc791bf84a4..ed55e8bf8467 100644
@@ -168,7 +168,7 @@ extern int timer_delete(struct timer_list *timer);
 extern int timer_shutdown_sync(struct timer_list *timer);
 extern int timer_shutdown(struct timer_list *timer);
 
-extern void init_timers(void);
+extern void timers_init(void);
 struct hrtimer;
 extern enum hrtimer_restart it_real_fn(struct hrtimer *);
 
init/main.c +1 -1
index 7f0a2a3dbd29..bf9c5d22953b 100644
@@ -1002,7 +1002,7 @@ void start_kernel(void)
 	init_IRQ();
 	tick_init();
 	rcu_init_nohz();
-	init_timers();
+	timers_init();
 	srcu_init();
 	hrtimers_init();
 	softirq_init();
kernel/time/timer.c +1 -1
index cba4f1118263..7046a9c86bb2 100644
@@ -2612,7 +2612,7 @@ static void __init init_timer_cpus(void)
 		init_timer_cpu(cpu);
 }
 
-void __init init_timers(void)
+void __init timers_init(void)
 {
 	init_timer_cpus();
 	posix_cputimers_init_work();
Signature · 1 line
2.45.2
#27 lore raw
In reply to Ingo Molnar
Quoted 8 lines · Ingo Molnar

Complete the timer API namespace cleanup that begun with:

8fa7292fee5c treewide: Switch/rename to timer_delete[_sync]()

The best way to view this series is to look at the right side column of this table of renames, in order of API appearance in <linux/timer.h>:

Quoted 12 lines
       add_timer_global()                  =>          timer_add_global()
       add_timer_local()                   =>          timer_add_local()
       from_timer()                        =>          timer_container_of()
       mod_timer_pending()                 =>          timer_mod_pending()
       timer_delete()              ... [unchanged] ... timer_delete()
       timer_reduce()              ... [unchanged] ... timer_reduce()
       timer_shutdown()            ... [unchanged] ... timer_shutdown()
       timer_shutdown_sync()       ... [unchanged] ... timer_shutdown_sync()
       try_to_del_timer_sync()             =>          timer_delete_sync_try()
       add_timer()                         =>          timer_add()
       add_timer_on()                      =>          timer_add_on()
       mod_timer()                         =>          timer_mod()

BTW., my suggestion would be to maybe change this to timer_modify(), because timer_mod() reads a bit weirdly.

This would be similar to how del_timer() was changed to timer_delete().

I didn't want to make bigger, discretionary changes in the first iteration, but I can easily propagate any such suggestions into future versions of this series.

If we do that, we'd also do timer_modify_pending().

Quoted 7 lines

timer_delete_sync() ... [unchanged] ... timer_delete_sync()
timer_setup_on_stack() ... [unchanged] ... timer_setup_on_stack()
destroy_timer_on_stack() => timer_destroy_on_stack()
timer_pending() ... [unchanged] ... timer_pending()
timer_setup() ... [unchanged] ... timer_setup()
init_timer_key() => timer_init_key()
init_timer_on_stack_key() => timer_init_on_stack_key()

Maybe timer_init_key_on_stack()? Because the base name should be 'timer_init_key'.

That would similar to how we have:

		__timer_init()
		__timer_init_on_stack()

where _on_stack is a suffix.

Quoted 9 lines
       __init_timer()                      =>          __timer_init()
       __init_timer_on_stack()             =>          __timer_init_on_stack()

NEXT_TIMER_MAX_DELTA => TIMER_NEXT_MAX_DELTA

init_timers() => timers_init()
timers_dead_cpu() ... [unchanged] ... timers_dead_cpu()
timers_prepare_cpu() ... [unchanged] ... timers_prepare_cpu()

Note that with this rename there's now a unified timers_*() namespace for subsystem-wide functionality, such as boot-time setup or hotplug callbacks.

Thanks,

Ingo

#28 lore raw
Quoted 14 lines · Ingo Molnar
Quoted 4 lines · Ingo Molnar
       add_timer_global()                  =>          timer_add_global()
       add_timer_local()                   =>          timer_add_local()
       from_timer()                        =>          timer_container_of()
       mod_timer_pending()                 =>          timer_mod_pending()
Quoted 8 lines
       timer_delete()              ... [unchanged] ... timer_delete()
       timer_reduce()              ... [unchanged] ... timer_reduce()
       timer_shutdown()            ... [unchanged] ... timer_shutdown()
       timer_shutdown_sync()       ... [unchanged] ... timer_shutdown_sync()
       try_to_del_timer_sync()             =>          timer_delete_sync_try()
       add_timer()                         =>          timer_add()
       add_timer_on()                      =>          timer_add_on()
       mod_timer()                         =>          timer_mod()
Quoted 2 lines

BTW., my suggestion would be to maybe change this to timer_modify(), because timer_mod() reads a bit weirdly.

Can you make your mind up _before_ spamming people with half baked changes done in a hurry? :)

While I appreciate proper namespace prefixes, this series is just a mechanical conversion without any additional value. Some of the conversions like try_to_del_timer_sync() are obviously fine and can't provide moar than a namespace consolidation.

But if you look at the actual functions and their usage all over the place then you can see that there is way more cleanup and consolidation potential especially for those functions which add or modify timers.

First of all the question is whether add() and mod() are really valuable distinctions. I'm not convinced at all. Back then, when we introduced hrtimers, we came to the conclusion that hrtimer_start() is sufficient.

But that aside there is a major cleanup potential for this stuff. The vast majority of add/mod_timer() sites uses:

- Precomputed timeout values derived from a timeout provided in SE units

- Instant conversions of SE unit based timeouts to jiffies

msec/usec/sec_to_jiffies()

- All variants of HZ, HZ * N, HZ / N ....

This is lots of duplicated and copy and pasted code. So instead of blindly renaming things, we can be smarter and provide sensible functions:

mod_timer() takes an absolute expiry value, but most places use

    mod_timer(t, jiffies + $timeout);

So the obvious first step is to provide:

    timer_start_rel(t, $timeout);

which does the addition of jiffies under the hood.

And because $timeout is some of the above calculations, we can be smart and provide:

   timer_start_rel_secs(t, timeout_in_seconds);
   timer_start_rel_msecs(t, timeout_in_milliseconds);
   timer_start_rel_usecs(t, timeout_in_microseconds);

This all can be sensibly converted with coccinelle, which even can handle the cases where $timeout is calculated from HZ / N.

I have a pile of half finished coccinelle scripts somewhere, which do exactly such a conversion. I just ran out of time to play with that, as I ran into a few things which need more thoughts about proper interfaces. I'm happy to share them.

Converting the whole timer arming to use SE unit based timeouts makes a lot of sense in general and also paves the way to boot-time controlled HZ, which is something distros and others are asking for since years (of course nobody wants to sit down and do the actual work as usual...)

That said, I'm fine to convert the obvious things, like try_timer_del*(), where there is no other consolidation value, but for everything else we better sit down and think about proper interfaces and large scale consolidation.

Thanks,

tglx

#29 lore raw
Quoted 2 lines · Thomas Gleixner

While I appreciate proper namespace prefixes, this series is just a mechanical conversion without any additional value.

Yes, intentionally so, as mentioned I didn't even rename any of the APIs beyond the trivial conversion, because I wanted to gather feedback first:

Quoted 1 line
Quoted 1 line

I didn't want to make bigger, discretionary changes in the first

    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Quoted 1 line
Quoted 1 line

iteration, but I can easily propagate any such suggestions into

    ^^^^^^^^^
Quoted 1 line
Quoted 1 line

future versions of this series.

    https://lore.kernel.org/all/[email protected]/

Can you please acknowledge this clearly declared, intentionally limited scope of the -v1 series, instead of deriding it as 'mindless'? :-)

Quoted 10 lines

[...] Some of the conversions like try_to_del_timer_sync() are obviously fine and can't provide moar than a namespace consolidation.

But if you look at the actual functions and their usage all over the place then you can see that there is way more cleanup and consolidation potential especially for those functions which add or modify timers.

First of all the question is whether add() and mod() are really valuable distinctions. I'm not convinced at all. Back then, when we introduced hrtimers, we came to the conclusion that hrtimer_start() is sufficient.

I didn't want to mix namespace cleanups with functional cleanups, but sure, I'd be glad to do that too.

Quoted 33 lines

But that aside there is a major cleanup potential for this stuff. The vast majority of add/mod_timer() sites uses:

- Precomputed timeout values derived from a timeout provided in SE units

- Instant conversions of SE unit based timeouts to jiffies

msec/usec/sec_to_jiffies()

- All variants of HZ, HZ * N, HZ / N ....

This is lots of duplicated and copy and pasted code. So instead of blindly renaming things, we can be smarter and provide sensible functions:

mod_timer() takes an absolute expiry value, but most places use

    mod_timer(t, jiffies + $timeout);

So the obvious first step is to provide:

    timer_start_rel(t, $timeout);

which does the addition of jiffies under the hood.

And because $timeout is some of the above calculations, we can be smart and provide:

   timer_start_rel_secs(t, timeout_in_seconds);
   timer_start_rel_msecs(t, timeout_in_milliseconds);
   timer_start_rel_usecs(t, timeout_in_microseconds);
Quoted 7 lines

This all can be sensibly converted with coccinelle, which even can handle the cases where $timeout is calculated from HZ / N.

I have a pile of half finished coccinelle scripts somewhere, which do exactly such a conversion. I just ran out of time to play with that, as I ran into a few things which need more thoughts about proper interfaces. I'm happy to share them.

Please do!

See why I sent the simple approach first? :-)

Quoted 10 lines

Converting the whole timer arming to use SE unit based timeouts makes a lot of sense in general and also paves the way to boot-time controlled HZ, which is something distros and others are asking for since years (of course nobody wants to sit down and do the actual work as usual...)

That said, I'm fine to convert the obvious things, like try_timer_del*(), where there is no other consolidation value, but for everything else we better sit down and think about proper interfaces and large scale consolidation.

No arguments from me! :-)

Thanks,

Ingo