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 1 of 2

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

cover timers: Complete the timer_*() API renames

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>:

       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()

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()

__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()

... and to compare it with the hodgepodge of names on the left side. It's a lot more organized at a glance.

There's two preparatory commits that move existing names out of the way, plus the 15 renames, scripted.

Note that the -next cross section of this series is large:

   981 files changed, 3126 insertions(+), 3126 deletions(-)

So if/once the changes are acceptable, to reduce churn in -next and in maintainer trees my plan would be to send this to Linus at the end of the next merge window, shortly before v6.16-rc1, regenerated against Linus's latest tree, similarly to how 8fa7292fee5c was handled.

Note that the conversion was done based on sed, not Coccinelle, which makes sure names in comments and documentation are covered as well, at the expense of a higher risk of false-positive conversions and other mistakes.

The Git tree for these changes can be found in my tree at:

git://git.kernel.org/pub/scm/linux/kernel/git/mingo/tip.git WIP.timers/core

Light testing done so far.

Thanks,

Ingo

================>
Ingo Molnar (17):
rust: Rename timer_container_of() to hrtimer_container_of()
scsi: bfa: Rename 'timer_mod' to 'timer_module'
treewide, timers: Rename add_timer_global() => timer_add_global() treewide, timers: Rename add_timer_local() => timer_add_local() treewide, timers: Rename from_timer() => timer_container_of() treewide, timers: Rename mod_timer_pending() => timer_mod_pending() treewide, timers: Rename try_to_del_timer_sync() => timer_delete_sync_try() treewide, timers: Rename add_timer() => timer_add()
treewide, timers: Rename add_timer_on() => timer_add_on() treewide, timers: Rename mod_timer() => timer_mod()
treewide, timers: Rename destroy_timer_on_stack() => timer_destroy_on_stack() treewide, timers: Rename init_timer_key() => timer_init_key() treewide, timers: Rename init_timer_on_stack_key() => timer_init_on_stack_key() treewide, timers: Rename __init_timer() => __timer_init() treewide, timers: Rename __init_timer_on_stack() => __timer_init_on_stack() treewide, timers: Rename NEXT_TIMER_MAX_DELTA => TIMER_NEXT_MAX_DELTA treewide, timers: Rename init_timers() => timers_init()

 .../RCU/Design/Requirements/Requirements.rst       |   2 +-
 Documentation/RCU/rcu_dereference.rst              |   2 +-
 Documentation/core-api/local_ops.rst               |   4 +-
 Documentation/kernel-hacking/locking.rst           |   4 +-
 Documentation/scsi/ChangeLog.lpfc                  |   6 +-
 Documentation/trace/ftrace.rst                     |   4 +-
 .../translations/it_IT/kernel-hacking/locking.rst  |   4 +-
 .../translations/zh_CN/core-api/local_ops.rst      |   4 +-
 arch/alpha/kernel/process.c                        |   2 +-
 arch/alpha/kernel/srmcons.c                        |   6 +-
 arch/arm/mach-footbridge/dc21285.c                 |   4 +-
 arch/arm/mach-omap1/pm.c                           |   2 +-
 arch/arm/mach-pxa/sharpsl_pm.c                     |   6 +-
 arch/arm/mach-s3c/s3c64xx.c                        |   4 +-
 arch/arm/mach-s3c/s3c64xx.h                        |   6 +-
 arch/m68k/amiga/amisound.c                         |   2 +-
 arch/m68k/mac/macboing.c                           |   6 +-
 arch/mips/sgi-ip22/ip22-reset.c                    |   8 +-
 arch/mips/sgi-ip32/ip32-reset.c                    |   4 +-
 arch/powerpc/kvm/booke.c                           |  12 +--
 arch/powerpc/mm/book3s64/hash_utils.c              |   4 +-
 arch/powerpc/platforms/cell/spufs/sched.c          |   8 +-
 arch/powerpc/platforms/powermac/low_i2c.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                        |   6 +-
 arch/sh/drivers/pci/common.c                       |   6 +-
 arch/sh/drivers/pci/pci-sh7780.c                   |   2 +-
 arch/sh/drivers/push-switch.c                      |   2 +-
 arch/sparc/kernel/irq.h                            |   2 +-
 arch/sparc/kernel/led.c                            |   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 +-
 arch/sparc/kernel/viohs.c                          |   4 +-
 arch/um/drivers/vector_kern.c                      |   6 +-
 arch/x86/kernel/apic/vector.c                      |   6 +-
 arch/x86/kernel/cpu/mce/core.c                     |   2 +-
 arch/x86/kernel/tsc_sync.c                         |   4 +-
 arch/x86/kvm/cpuid.c                               |   4 +-
 arch/x86/kvm/lapic.c                               |  18 ++--
 arch/x86/kvm/lapic.h                               |   4 +-
 arch/x86/kvm/xen.c                                 |   4 +-
 arch/xtensa/platforms/iss/console.c                |   4 +-
 arch/xtensa/platforms/iss/network.c                |   6 +-
 arch/xtensa/platforms/xt2000/setup.c               |   4 +-
 block/blk-core.c                                   |   2 +-
 block/blk-iocost.c                                 |   2 +-
 block/blk-iolatency.c                              |   4 +-
 block/blk-mq.c                                     |   2 +-
 block/blk-stat.c                                   |   2 +-
 block/blk-stat.h                                   |   4 +-
 block/blk-throttle.c                               |   4 +-
 block/blk-timeout.c                                |   2 +-
 block/kyber-iosched.c                              |   2 +-
 drivers/accel/qaic/qaic_timesync.c                 |  12 +--
 drivers/accessibility/speakup/main.c               |   4 +-
 drivers/accessibility/speakup/synth.c              |   2 +-
 drivers/acpi/apei/ghes.c                           |   4 +-
 drivers/ata/libahci.c                              |   6 +-
 drivers/ata/libata-eh.c                            |   6 +-
 drivers/atm/idt77105.c                             |   8 +-
 drivers/atm/idt77252.c                             |  18 ++--
 drivers/atm/iphase.c                               |   6 +-
 drivers/atm/lanai.c                                |   6 +-
 drivers/atm/nicstar.c                              |   4 +-
 drivers/atm/suni.c                                 |   4 +-
 drivers/auxdisplay/line-display.c                  |   4 +-
 drivers/auxdisplay/panel.c                         |   4 +-
 drivers/base/power/main.c                          |   8 +-
 drivers/base/power/wakeup.c                        |   4 +-
 drivers/block/amiflop.c                            |  14 +--
 drivers/block/aoe/aoecmd.c                         |   4 +-
 drivers/block/aoe/aoedev.c                         |   6 +-
 drivers/block/aoe/aoemain.c                        |   2 +-
 drivers/block/ataflop.c                            |  14 +--
 drivers/block/drbd/drbd_main.c                     |   4 +-
 drivers/block/drbd/drbd_nl.c                       |   4 +-
 drivers/block/drbd/drbd_receiver.c                 |   4 +-
 drivers/block/drbd/drbd_req.c                      |   4 +-
 drivers/block/drbd/drbd_state.c                    |   4 +-
 drivers/block/drbd/drbd_worker.c                   |  14 +--
 drivers/block/floppy.c                             |   2 +-
 drivers/block/sunvdc.c                             |   2 +-
 drivers/block/swim3.c                              |  10 +-
 drivers/bluetooth/bluecard_cs.c                    |   6 +-
 drivers/bluetooth/btnxpuart.c                      |   4 +-
 drivers/bluetooth/hci_bcsp.c                       |   4 +-
 drivers/bluetooth/hci_h5.c                         |  10 +-
 drivers/bluetooth/hci_qca.c                        |  12 +--
 drivers/bus/mhi/host/pci_generic.c                 |  12 +--
 drivers/char/dtlk.c                                |   2 +-
 drivers/char/hangcheck-timer.c                     |   4 +-
 drivers/char/hw_random/xgene-rng.c                 |   4 +-
 drivers/char/ipmi/bt-bmc.c                         |   6 +-
 drivers/char/ipmi/ipmi_msghandler.c                |   6 +-
 drivers/char/ipmi/ipmi_si_intf.c                   |   4 +-
 drivers/char/ipmi/ipmi_ssif.c                      |  14 +--
 drivers/char/ipmi/kcs_bmc_aspeed.c                 |   4 +-
 drivers/char/ipmi/ssif_bmc.c                       |   4 +-
 drivers/char/nwbutton.c                            |   2 +-
 drivers/char/random.c                              |  10 +-
 drivers/char/tlclk.c                               |   2 +-
 drivers/char/tpm/tpm-dev-common.c                  |   6 +-
 drivers/clocksource/timer-ti-32k.c                 |   4 +-
 drivers/clocksource/timer-ti-dm.c                  |   6 +-
 drivers/comedi/drivers/addi_apci_3120.c            |  20 ++--
 drivers/comedi/drivers/addi_apci_3501.c            |   2 +-
 drivers/comedi/drivers/comedi_test.c               |  12 +--
 drivers/comedi/drivers/das16.c                     |   6 +-
 drivers/comedi/drivers/jr3_pci.c                   |   6 +-
 drivers/counter/rz-mtu3-cnt.c                      |  16 ++--
 drivers/cpufreq/powernv-cpufreq.c                  |   6 +-
 drivers/crypto/axis/artpec6_crypto.c               |   4 +-
 drivers/dma-buf/st-dma-fence.c                     |   6 +-
 drivers/dma/imx-dma.c                              |   4 +-
 drivers/dma/ioat/dma.c                             |  20 ++--
 drivers/firewire/core-transaction.c                |   6 +-
 drivers/firmware/psci/psci_checker.c               |   4 +-
 drivers/fpga/dfl-n3000-nios.c                      |  20 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c       |   4 +-
 drivers/gpu/drm/bridge/tda998x_drv.c               |   4 +-
 drivers/gpu/drm/drm_vblank.c                       |   4 +-
 drivers/gpu/drm/exynos/exynos_drm_vidi.c           |   6 +-
 drivers/gpu/drm/gud/gud_pipe.c                     |   6 +-
 drivers/gpu/drm/i915/gt/intel_rps.c                |   6 +-
 drivers/gpu/drm/i915/gt/mock_engine.c              |   6 +-
 drivers/gpu/drm/i915/gt/selftest_execlists.c       |   2 +-
 drivers/gpu/drm/i915/gt/selftest_migrate.c         |   6 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |   4 +-
 drivers/gpu/drm/i915/i915_utils.c                  |   2 +-
 drivers/gpu/drm/i915/intel_wakeref.c               |   4 +-
 drivers/gpu/drm/i915/selftests/lib_sw_fence.c      |   6 +-
 drivers/gpu/drm/mediatek/mtk_dp.c                  |   4 +-
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c          |   4 +-
 drivers/gpu/drm/msm/adreno/a6xx_preempt.c          |   4 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        |   4 +-
 drivers/gpu/drm/msm/msm_drv.h                      |   4 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |   4 +-
 drivers/gpu/drm/msm/msm_io_utils.c                 |   4 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c                  |   2 +-
 drivers/gpu/drm/ttm/tests/ttm_bo_test.c            |   6 +-
 drivers/gpu/drm/vc4/vc4_bo.c                       |   4 +-
 drivers/gpu/drm/vc4/vc4_gem.c                      |   4 +-
 drivers/gpu/drm/vgem/vgem_fence.c                  |   4 +-
 drivers/gpu/drm/xe/xe_execlist.c                   |   4 +-
 drivers/greybus/operation.c                        |   4 +-
 drivers/hid/hid-apple.c                            |   6 +-
 drivers/hid/hid-appleir.c                          |   6 +-
 drivers/hid/hid-appletb-kbd.c                      |   8 +-
 drivers/hid/hid-letsketch.c                        |   4 +-
 drivers/hid/hid-magicmouse.c                       |   6 +-
 drivers/hid/hid-multitouch.c                       |   4 +-
 drivers/hid/hid-nvidia-shield.c                    |   2 +-
 drivers/hid/hid-prodikeys.c                        |   4 +-
 drivers/hid/hid-sony.c                             |   6 +-
 drivers/hid/hid-uclogic-core.c                     |   4 +-
 drivers/hid/hid-wiimote-core.c                     |   8 +-
 drivers/hid/usbhid/hid-core.c                      |   4 +-
 drivers/hid/wacom_wac.c                            |   4 +-
 drivers/hsi/clients/ssi_protocol.c                 |  20 ++--
 drivers/hte/hte-tegra194-test.c                    |   4 +-
 drivers/hwmon/npcm750-pwm-fan.c                    |   6 +-
 drivers/hwmon/pwm-fan.c                            |   6 +-
 drivers/i2c/busses/i2c-img-scb.c                   |   8 +-
 drivers/iio/common/ssp_sensors/ssp_dev.c           |   6 +-
 drivers/infiniband/hw/cxgb4/cm.c                   |   4 +-
 drivers/infiniband/hw/hfi1/aspm.c                  |   4 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  14 +--
 drivers/infiniband/hw/hfi1/driver.c                |   6 +-
 drivers/infiniband/hw/hfi1/mad.c                   |   4 +-
 drivers/infiniband/hw/hfi1/sdma.c                  |   4 +-
 drivers/infiniband/hw/hfi1/tid_rdma.c              |  12 +--
 drivers/infiniband/hw/hfi1/verbs.c                 |   6 +-
 drivers/infiniband/hw/irdma/cm.c                   |   6 +-
 drivers/infiniband/hw/irdma/utils.c                |  10 +-
 drivers/infiniband/hw/mlx5/mr.c                    |   4 +-
 drivers/infiniband/hw/mthca/mthca_catas.c          |   6 +-
 drivers/infiniband/hw/qib/qib_driver.c             |   8 +-
 drivers/infiniband/hw/qib/qib_iba6120.c            |  16 ++--
 drivers/infiniband/hw/qib/qib_iba7220.c            |  12 +--
 drivers/infiniband/hw/qib/qib_iba7322.c            |  12 +--
 drivers/infiniband/hw/qib/qib_init.c               |   8 +-
 drivers/infiniband/hw/qib/qib_intr.c               |   4 +-
 drivers/infiniband/hw/qib/qib_mad.c                |   6 +-
 drivers/infiniband/hw/qib/qib_sd7220.c             |  10 +-
 drivers/infiniband/hw/qib/qib_tx.c                 |   8 +-
 drivers/infiniband/hw/qib/qib_verbs.c              |   6 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |   4 +-
 drivers/infiniband/sw/rxe/rxe_comp.c               |   6 +-
 drivers/infiniband/sw/rxe/rxe_req.c                |   4 +-
 drivers/input/ff-memless.c                         |   4 +-
 drivers/input/gameport/gameport.c                  |   6 +-
 drivers/input/input.c                              |   6 +-
 drivers/input/joystick/db9.c                       |   6 +-
 drivers/input/joystick/gamecon.c                   |   6 +-
 drivers/input/joystick/n64joy.c                    |   4 +-
 drivers/input/joystick/turbografx.c                |   6 +-
 drivers/input/keyboard/imx_keypad.c                |   8 +-
 drivers/input/keyboard/locomokbd.c                 |   4 +-
 drivers/input/keyboard/omap-keypad.c               |   2 +-
 drivers/input/keyboard/snvs_pwrkey.c               |   6 +-
 drivers/input/keyboard/tegra-kbc.c                 |   6 +-
 drivers/input/misc/nxp-bbnsm-pwrkey.c              |   6 +-
 drivers/input/mouse/alps.c                         |   4 +-
 drivers/input/mouse/byd.c                          |   4 +-
 drivers/input/serio/hil_mlc.c                      |   6 +-
 drivers/input/serio/hp_sdc.c                       |   4 +-
 drivers/input/touchscreen/ad7877.c                 |   4 +-
 drivers/input/touchscreen/ad7879.c                 |   4 +-
 drivers/input/touchscreen/bu21029_ts.c             |   4 +-
 drivers/input/touchscreen/exc3000.c                |   4 +-
 drivers/input/touchscreen/sx8654.c                 |   4 +-
 drivers/input/touchscreen/tsc200x-core.c           |   4 +-
 drivers/iommu/dma-iommu.c                          |   4 +-
 drivers/irqchip/irq-riscv-imsic-state.c            |   4 +-
 drivers/isdn/hardware/mISDN/hfcpci.c               |   8 +-
 drivers/isdn/hardware/mISDN/mISDNipac.c            |   4 +-
 drivers/isdn/hardware/mISDN/mISDNisar.c            |   4 +-
 drivers/isdn/hardware/mISDN/w6692.c                |   4 +-
 drivers/isdn/mISDN/dsp_cmx.c                       |   2 +-
 drivers/isdn/mISDN/dsp_core.c                      |   2 +-
 drivers/isdn/mISDN/dsp_tones.c                     |   6 +-
 drivers/isdn/mISDN/fsm.c                           |   6 +-
 drivers/isdn/mISDN/l1oip_core.c                    |  10 +-
 drivers/isdn/mISDN/timerdev.c                      |   4 +-
 drivers/leds/flash/leds-rt8515.c                   |   4 +-
 drivers/leds/flash/leds-sgm3140.c                  |   4 +-
 drivers/leds/led-core.c                            |   6 +-
 drivers/leds/leds-netxbig.c                        |   4 +-
 drivers/leds/trigger/ledtrig-activity.c            |   4 +-
 drivers/leds/trigger/ledtrig-heartbeat.c           |   4 +-
 drivers/leds/trigger/ledtrig-pattern.c             |   6 +-
 drivers/leds/trigger/ledtrig-transient.c           |   4 +-
 drivers/macintosh/smu.c                            |   2 +-
 drivers/mailbox/mailbox-altera.c                   |   6 +-
 drivers/md/bcache/stats.c                          |   6 +-
 drivers/md/dm-delay.c                              |   2 +-
 drivers/md/dm-integrity.c                          |   4 +-
 drivers/md/dm-mpath.c                              |   4 +-
 drivers/md/dm-raid1.c                              |   4 +-
 drivers/md/dm-vdo/dedupe.c                         |   4 +-
 drivers/md/dm-writecache.c                         |  10 +-
 drivers/md/md.c                                    |   6 +-
 drivers/media/common/saa7146/saa7146_fops.c        |   2 +-
 drivers/media/common/saa7146/saa7146_vbi.c         |   4 +-
 drivers/media/common/saa7146/saa7146_video.c       |   2 +-
 drivers/media/dvb-core/dmxdev.c                    |   4 +-
 drivers/media/i2c/tc358743.c                       |   6 +-
 drivers/media/i2c/tvaudio.c                        |   6 +-
 drivers/media/pci/bt8xx/bttv-driver.c              |   2 +-
 drivers/media/pci/bt8xx/bttv-input.c               |  10 +-
 drivers/media/pci/bt8xx/bttv-risc.c                |   2 +-
 drivers/media/pci/cx18/cx18-fileops.c              |   2 +-
 drivers/media/pci/cx18/cx18-mailbox.c              |   2 +-
 drivers/media/pci/cx18/cx18-streams.c              |   2 +-
 drivers/media/pci/ivtv/ivtv-irq.c                  |   8 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c |   4 +-
 drivers/media/pci/saa7134/saa7134-core.c           |   2 +-
 drivers/media/pci/saa7134/saa7134-input.c          |   6 +-
 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             |   4 +-
 drivers/media/pci/tw686x/tw686x-video.c            |   2 +-
 drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c   |   6 +-
 .../platform/st/sti/c8sectpfe/c8sectpfe-core.c     |   6 +-
 drivers/media/radio/radio-cadet.c                  |   6 +-
 drivers/media/rc/ene_ir.c                          |   4 +-
 drivers/media/rc/igorplugusb.c                     |   4 +-
 drivers/media/rc/img-ir/img-ir-hw.c                |   8 +-
 drivers/media/rc/img-ir/img-ir-raw.c               |   4 +-
 drivers/media/rc/imon.c                            |   4 +-
 drivers/media/rc/ir-mce_kbd-decoder.c              |   4 +-
 drivers/media/rc/rc-ir-raw.c                       |   6 +-
 drivers/media/rc/rc-main.c                         |  12 +--
 drivers/media/rc/serial_ir.c                       |   2 +-
 drivers/media/usb/au0828/au0828-dvb.c              |   4 +-
 drivers/media/usb/au0828/au0828-video.c            |  20 ++--
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            |  22 ++---
 drivers/media/usb/s2255/s2255drv.c                 |   4 +-
 drivers/memory/tegra/tegra210-emc-core.c           |  12 +--
 drivers/memstick/core/ms_block.c                   |   4 +-
 drivers/memstick/host/jmb38x_ms.c                  |   4 +-
 drivers/memstick/host/r592.c                       |   4 +-
 drivers/memstick/host/tifm_ms.c                    |   4 +-
 drivers/misc/bcm-vk/bcm_vk_tty.c                   |   6 +-
 drivers/misc/cardreader/rtsx_usb.c                 |   4 +-
 drivers/misc/sgi-xp/xpc.h                          |   2 +-
 drivers/misc/sgi-xp/xpc_main.c                     |   4 +-
 drivers/misc/sgi-xp/xpc_partition.c                |   6 +-
 drivers/mmc/core/host.c                            |   4 +-
 drivers/mmc/host/atmel-mci.c                       |  10 +-
 drivers/mmc/host/dw_mmc.c                          |  12 +--
 drivers/mmc/host/jz4740_mmc.c                      |   6 +-
 drivers/mmc/host/meson-mx-sdio.c                   |   4 +-
 drivers/mmc/host/mvsdio.c                          |   4 +-
 drivers/mmc/host/mxcmmc.c                          |   4 +-
 drivers/mmc/host/omap.c                            |  12 +--
 drivers/mmc/host/sdhci.c                           |   8 +-
 drivers/mmc/host/tifm_sd.c                         |   4 +-
 drivers/mmc/host/via-sdmmc.c                       |   4 +-
 drivers/mmc/host/vub300.c                          |  22 ++---
 drivers/mmc/host/wbsd.c                            |   4 +-
 drivers/most/most_usb.c                            |   6 +-
 drivers/mtd/sm_ftl.c                               |   4 +-
 drivers/net/arcnet/arcnet.c                        |   6 +-
 drivers/net/can/grcan.c                            |   6 +-
 drivers/net/can/kvaser_pciefd.c                    |   8 +-
 drivers/net/can/sja1000/peak_pcmcia.c              |   6 +-
 drivers/net/can/usb/peak_usb/pcan_usb.c            |   4 +-
 drivers/net/dsa/mv88e6xxx/phy.c                    |   4 +-
 drivers/net/dsa/sja1105/sja1105_ptp.c              |   2 +-
 drivers/net/eql.c                                  |   6 +-
 drivers/net/ethernet/3com/3c515.c                  |   6 +-
 drivers/net/ethernet/3com/3c574_cs.c               |   8 +-
 drivers/net/ethernet/3com/3c589_cs.c               |   8 +-
 drivers/net/ethernet/3com/3c59x.c                  |  10 +-
 drivers/net/ethernet/8390/axnet_cs.c               |   8 +-
 drivers/net/ethernet/8390/pcnet_cs.c               |   8 +-
 drivers/net/ethernet/agere/et131x.c                |   6 +-
 drivers/net/ethernet/amazon/ena/ena_netdev.c       |   8 +-
 drivers/net/ethernet/amd/a2065.c                   |   4 +-
 drivers/net/ethernet/amd/amd8111e.c                |   8 +-
 drivers/net/ethernet/amd/declance.c                |   4 +-
 drivers/net/ethernet/amd/pcnet32.c                 |   6 +-
 drivers/net/ethernet/amd/pds_core/main.c           |   8 +-
 drivers/net/ethernet/amd/sunlance.c                |   4 +-
 drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |   2 +-
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |  10 +-
 drivers/net/ethernet/apple/bmac.c                  |   4 +-
 drivers/net/ethernet/apple/mace.c                  |   4 +-
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |  10 +-
 drivers/net/ethernet/atheros/ag71xx.c              |   4 +-
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |   2 +-
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   2 +-
 drivers/net/ethernet/atheros/atlx/atl1.c           |   4 +-
 drivers/net/ethernet/atheros/atlx/atl2.c           |  10 +-
 drivers/net/ethernet/broadcom/b44.c                |   8 +-
 drivers/net/ethernet/broadcom/bcm63xx_enet.c       |  10 +-
 drivers/net/ethernet/broadcom/bnx2.c               |  10 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |   2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |   4 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |   6 +-
 drivers/net/ethernet/broadcom/tg3.c                |   6 +-
 drivers/net/ethernet/brocade/bna/bfa_ioc.c         |  20 ++--
 drivers/net/ethernet/brocade/bna/bnad.c            |  22 ++---
 drivers/net/ethernet/chelsio/cxgb/sge.c            |  16 ++--
 drivers/net/ethernet/chelsio/cxgb3/sge.c           |  12 +--
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c   |   6 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |  12 +--
 drivers/net/ethernet/chelsio/cxgb4vf/sge.c         |  12 +--
 drivers/net/ethernet/cisco/enic/enic_clsf.c        |   4 +-
 drivers/net/ethernet/cisco/enic/enic_clsf.h        |   2 +-
 drivers/net/ethernet/cisco/enic/enic_main.c        |   6 +-
 drivers/net/ethernet/dec/tulip/21142.c             |   8 +-
 drivers/net/ethernet/dec/tulip/de2104x.c           |  20 ++--
 drivers/net/ethernet/dec/tulip/dmfe.c              |  10 +-
 drivers/net/ethernet/dec/tulip/interrupt.c         |   8 +-
 drivers/net/ethernet/dec/tulip/pnic.c              |   4 +-
 drivers/net/ethernet/dec/tulip/pnic2.c             |  10 +-
 drivers/net/ethernet/dec/tulip/timer.c             |  14 +--
 drivers/net/ethernet/dec/tulip/tulip_core.c        |   4 +-
 drivers/net/ethernet/dec/tulip/uli526x.c           |   8 +-
 drivers/net/ethernet/dec/tulip/winbond-840.c       |   8 +-
 drivers/net/ethernet/dlink/dl2k.c                  |   8 +-
 drivers/net/ethernet/fealnx.c                      |  10 +-
 drivers/net/ethernet/google/gve/gve_ethtool.c      |   2 +-
 drivers/net/ethernet/google/gve/gve_main.c         |   6 +-
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      |   6 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c    |   6 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c  |   4 +-
 drivers/net/ethernet/intel/e100.c                  |   8 +-
 drivers/net/ethernet/intel/e1000e/netdev.c         |  16 ++--
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |   8 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  10 +-
 drivers/net/ethernet/intel/ice/ice_main.c          |  14 +--
 drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c |   4 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |  18 ++--
 drivers/net/ethernet/intel/igbvf/netdev.c          |  10 +-
 drivers/net/ethernet/intel/igc/igc_main.c          |  18 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   6 +-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |   6 +-
 drivers/net/ethernet/korina.c                      |   6 +-
 drivers/net/ethernet/marvell/mv643xx_eth.c         |  12 +--
 drivers/net/ethernet/marvell/pxa168_eth.c          |   4 +-
 drivers/net/ethernet/marvell/skge.c                |   8 +-
 drivers/net/ethernet/marvell/sky2.c                |   6 +-
 drivers/net/ethernet/mellanox/mlx4/catas.c         |   6 +-
 drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c |   6 +-
 drivers/net/ethernet/mellanox/mlx5/core/health.c   |   6 +-
 drivers/net/ethernet/micrel/ksz884x.c              |  10 +-
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |   6 +-
 drivers/net/ethernet/natsemi/natsemi.c             |  12 +--
 drivers/net/ethernet/natsemi/ns83820.c             |   6 +-
 drivers/net/ethernet/neterion/s2io.c               |   6 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |   4 +-
 drivers/net/ethernet/nvidia/forcedeth.c            |  34 +++----
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |   6 +-
 drivers/net/ethernet/packetengines/hamachi.c       |   6 +-
 drivers/net/ethernet/packetengines/yellowfin.c     |   6 +-
 drivers/net/ethernet/pasemi/pasemi_mac.c           |   8 +-
 .../net/ethernet/pensando/ionic/ionic_bus_pci.c    |   4 +-
 drivers/net/ethernet/pensando/ionic/ionic_dev.c    |   4 +-
 drivers/net/ethernet/pensando/ionic/ionic_lif.c    |   2 +-
 drivers/net/ethernet/qlogic/qla3xxx.c              |   8 +-
 drivers/net/ethernet/realtek/atp.c                 |   8 +-
 drivers/net/ethernet/rocker/rocker_ofdpa.c         |   8 +-
 drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |  14 +--
 drivers/net/ethernet/seeq/ether3.c                 |   4 +-
 drivers/net/ethernet/sfc/falcon/efx.c              |   2 +-
 drivers/net/ethernet/sfc/falcon/falcon.c           |   4 +-
 drivers/net/ethernet/sfc/falcon/rx.c               |   2 +-
 drivers/net/ethernet/sfc/mcdi.c                    |   6 +-
 drivers/net/ethernet/sfc/rx_common.c               |   4 +-
 drivers/net/ethernet/sfc/siena/mcdi.c              |   6 +-
 drivers/net/ethernet/sfc/siena/rx_common.c         |   4 +-
 drivers/net/ethernet/sgi/ioc3-eth.c                |   6 +-
 drivers/net/ethernet/sis/sis190.c                  |   8 +-
 drivers/net/ethernet/sis/sis900.c                  |   6 +-
 drivers/net/ethernet/smsc/epic100.c                |   6 +-
 drivers/net/ethernet/smsc/smc91c92_cs.c            |   8 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c   |   6 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   4 +-
 drivers/net/ethernet/sun/cassini.c                 |  12 +--
 drivers/net/ethernet/sun/niu.c                     |  12 +--
 drivers/net/ethernet/sun/sunbmac.c                 |   6 +-
 drivers/net/ethernet/sun/sungem.c                  |   8 +-
 drivers/net/ethernet/sun/sunhme.c                  |   6 +-
 drivers/net/ethernet/sun/sunvnet_common.c          |   8 +-
 drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c      |   2 +-
 drivers/net/ethernet/synopsys/dwc-xlgmac-net.c     |   2 +-
 drivers/net/ethernet/ti/cpsw_ale.c                 |   6 +-
 drivers/net/ethernet/ti/netcp_ethss.c              |   6 +-
 drivers/net/ethernet/ti/tlan.c                     |  18 ++--
 drivers/net/ethernet/tundra/tsi108_eth.c           |   6 +-
 drivers/net/fddi/defza.c                           |   6 +-
 drivers/net/hamradio/6pack.c                       |  12 +--
 drivers/net/hamradio/scc.c                         |  22 ++---
 drivers/net/hamradio/yam.c                         |   4 +-
 drivers/net/hippi/rrunner.c                        |   6 +-
 drivers/net/ntb_netdev.c                           |   6 +-
 drivers/net/phy/phylink.c                          |   6 +-
 drivers/net/slip/slip.c                            |  20 ++--
 drivers/net/tun.c                                  |   8 +-
 drivers/net/usb/catc.c                             |   6 +-
 drivers/net/usb/lan78xx.c                          |  10 +-
 drivers/net/usb/sierra_net.c                       |   4 +-
 drivers/net/usb/usbnet.c                           |   6 +-
 drivers/net/vxlan/vxlan_core.c                     |   8 +-
 drivers/net/wan/hdlc_cisco.c                       |   6 +-
 drivers/net/wan/hdlc_fr.c                          |   6 +-
 drivers/net/wan/hdlc_ppp.c                         |  10 +-
 drivers/net/wireguard/timers.c                     |  12 +--
 drivers/net/wireless/ath/ar5523/ar5523.c           |   6 +-
 drivers/net/wireless/ath/ath10k/htt_rx.c           |   6 +-
 drivers/net/wireless/ath/ath10k/pci.c              |   8 +-
 drivers/net/wireless/ath/ath10k/sdio.c             |   4 +-
 drivers/net/wireless/ath/ath10k/snoc.c             |   4 +-
 drivers/net/wireless/ath/ath11k/ce.c               |   6 +-
 drivers/net/wireless/ath/ath11k/dp.c               |   6 +-
 drivers/net/wireless/ath/ath11k/dp_rx.c            |  10 +-
 drivers/net/wireless/ath/ath11k/dp_tx.c            |   2 +-
 drivers/net/wireless/ath/ath11k/mac.c              |   2 +-
 drivers/net/wireless/ath/ath12k/ce.c               |   6 +-
 drivers/net/wireless/ath/ath12k/dp.c               |   4 +-
 drivers/net/wireless/ath/ath12k/dp_rx.c            |   4 +-
 drivers/net/wireless/ath/ath6kl/cfg80211.c         |   2 +-
 drivers/net/wireless/ath/ath6kl/main.c             |   2 +-
 drivers/net/wireless/ath/ath6kl/recovery.c         |  10 +-
 drivers/net/wireless/ath/ath6kl/txrx.c             |   6 +-
 drivers/net/wireless/ath/ath6kl/wmi.c              |   4 +-
 drivers/net/wireless/ath/ath9k/channel.c           |  12 +--
 drivers/net/wireless/ath/ath9k/gpio.c              |  10 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   6 +-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |   4 +-
 drivers/net/wireless/ath/ath9k/link.c              |   6 +-
 drivers/net/wireless/ath/ath9k/main.c              |   4 +-
 drivers/net/wireless/ath/wcn36xx/dxe.c             |   4 +-
 drivers/net/wireless/ath/wil6210/cfg80211.c        |   6 +-
 drivers/net/wireless/ath/wil6210/netdev.c          |   6 +-
 drivers/net/wireless/ath/wil6210/p2p.c             |   4 +-
 drivers/net/wireless/atmel/at76c50x-usb.c          |   4 +-
 .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c  |   8 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   4 +-
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |   8 +-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |   8 +-
 drivers/net/wireless/intel/ipw2x00/libipw_crypto.c |   6 +-
 drivers/net/wireless/intel/iwlegacy/3945-rs.c      |   6 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |   4 +-
 drivers/net/wireless/intel/iwlegacy/common.c       |   6 +-
 drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c   |   2 +-
 drivers/net/wireless/intel/iwlwifi/dvm/main.c      |   8 +-
 drivers/net/wireless/intel/iwlwifi/dvm/rx.c        |   2 +-
 drivers/net/wireless/intel/iwlwifi/dvm/tt.c        |  10 +-
 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c   |   6 +-
 drivers/net/wireless/intel/iwlwifi/mld/agg.c       |   6 +-
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |   6 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c  |   4 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |  10 +-
 drivers/net/wireless/marvell/libertas/cmd.c        |   2 +-
 drivers/net/wireless/marvell/libertas/if_usb.c     |   4 +-
 drivers/net/wireless/marvell/libertas/main.c       |   6 +-
 drivers/net/wireless/marvell/libertas_tf/cmd.c     |   2 +-
 drivers/net/wireless/marvell/libertas_tf/if_usb.c  |   4 +-
 drivers/net/wireless/marvell/libertas_tf/main.c    |   2 +-
 .../net/wireless/marvell/mwifiex/11n_rxreorder.c   |   4 +-
 drivers/net/wireless/marvell/mwifiex/cmdevt.c      |   4 +-
 drivers/net/wireless/marvell/mwifiex/init.c        |   2 +-
 drivers/net/wireless/marvell/mwifiex/main.c        |   2 +-
 drivers/net/wireless/marvell/mwifiex/tdls.c        |   6 +-
 drivers/net/wireless/marvell/mwifiex/usb.c         |   8 +-
 drivers/net/wireless/mediatek/mt76/mt7615/main.c   |   2 +-
 drivers/net/wireless/mediatek/mt76/mt7615/mcu.c    |   2 +-
 drivers/net/wireless/mediatek/mt76/mt7921/main.c   |   4 +-
 drivers/net/wireless/mediatek/mt76/mt7921/mcu.c    |   2 +-
 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c    |   2 +-
 drivers/net/wireless/mediatek/mt76/mt792x_core.c   |   4 +-
 drivers/net/wireless/microchip/wilc1000/cfg80211.c |   2 +-
 drivers/net/wireless/microchip/wilc1000/hif.c      |  16 ++--
 drivers/net/wireless/purelifi/plfxlc/usb.c         |  12 +--
 drivers/net/wireless/realtek/rtlwifi/base.c        |   4 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c    |   4 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c    |   8 +-
 .../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            |   4 +-
 drivers/net/wireless/rsi/rsi_91x_hal.c             |   4 +-
 drivers/net/wireless/rsi/rsi_91x_mac80211.c        |   4 +-
 drivers/net/wireless/st/cw1200/pm.c                |   2 +-
 drivers/net/wireless/st/cw1200/queue.c             |   6 +-
 drivers/net/wireless/st/cw1200/sta.c               |   4 +-
 drivers/net/wireless/ti/wlcore/main.c              |   4 +-
 drivers/net/wireless/ti/wlcore/tx.c                |   2 +-
 drivers/net/xen-netback/netback.c                  |   4 +-
 drivers/net/xen-netback/xenbus.c                   |   2 +-
 drivers/net/xen-netfront.c                         |   4 +-
 drivers/nfc/nfcmrvl/fw_dnld.c                      |   4 +-
 drivers/nfc/pn533/pn533.c                          |   6 +-
 drivers/nfc/pn533/uart.c                           |   4 +-
 drivers/nfc/st-nci/ndlc.c                          |  12 +--
 drivers/nfc/st-nci/se.c                            |  12 +--
 drivers/nfc/st21nfca/core.c                        |   2 +-
 drivers/nfc/st21nfca/se.c                          |  10 +-
 drivers/nvme/host/multipath.c                      |   4 +-
 drivers/parport/ieee1284.c                         |   4 +-
 drivers/pci/hotplug/cpqphp_ctrl.c                  |   6 +-
 drivers/pci/hotplug/shpchp_hpc.c                   |   4 +-
 drivers/pcmcia/bcm63xx_pcmcia.c                    |   6 +-
 drivers/pcmcia/electra_cf.c                        |   4 +-
 drivers/pcmcia/i82365.c                            |   4 +-
 drivers/pcmcia/omap_cf.c                           |   6 +-
 drivers/pcmcia/pd6729.c                            |   6 +-
 drivers/pcmcia/soc_common.c                        |   4 +-
 drivers/pcmcia/tcic.c                              |   2 +-
 drivers/pcmcia/yenta_socket.c                      |   6 +-
 drivers/platform/mellanox/mlxbf-tmfifo.c           |   4 +-
 drivers/platform/x86/intel_ips.c                   |   4 +-
 drivers/platform/x86/sony-laptop.c                 |   4 +-
 drivers/pps/clients/pps-gpio.c                     |   6 +-
 drivers/pps/clients/pps-ktimer.c                   |   4 +-
 drivers/pps/generators/pps_gen-dummy.c             |   2 +-
 drivers/ptp/ptp_ocp.c                              |   6 +-
 drivers/rtc/dev.c                                  |   4 +-
 drivers/rtc/rtc-test.c                             |   6 +-
 drivers/s390/block/dasd.c                          |   8 +-
 drivers/s390/char/con3215.c                        |   6 +-
 drivers/s390/char/con3270.c                        |   4 +-
 drivers/s390/char/sclp.c                           |   6 +-
 drivers/s390/char/sclp_con.c                       |   2 +-
 drivers/s390/char/sclp_tty.c                       |   2 +-
 drivers/s390/char/sclp_vt220.c                     |   2 +-
 drivers/s390/char/tape_core.c                      |   4 +-
 drivers/s390/char/tape_std.c                       |   4 +-
 drivers/s390/cio/device.c                          |   4 +-
 drivers/s390/cio/device_fsm.c                      |   4 +-
 drivers/s390/cio/eadm_sch.c                        |   4 +-
 drivers/s390/crypto/ap_bus.c                       |   6 +-
 drivers/s390/crypto/ap_queue.c                     |   4 +-
 drivers/s390/net/fsm.c                             |   6 +-
 drivers/s390/net/qeth_core_main.c                  |   2 +-
 drivers/s390/scsi/zfcp_erp.c                       |   6 +-
 drivers/s390/scsi/zfcp_fsf.c                       |   6 +-
 drivers/s390/scsi/zfcp_qdio.c                      |   2 +-
 drivers/scsi/aic7xxx/aic79xx_core.c                |   4 +-
 drivers/scsi/aic94xx/aic94xx_hwi.c                 |   2 +-
 drivers/scsi/aic94xx/aic94xx_scb.c                 |   2 +-
 drivers/scsi/aic94xx/aic94xx_tmf.c                 |   6 +-
 drivers/scsi/arcmsr/arcmsr_hba.c                   |  18 ++--
 drivers/scsi/arm/fas216.c                          |   6 +-
 drivers/scsi/be2iscsi/be_main.c                    |  10 +-
 drivers/scsi/bfa/bfa.h                             |   2 +-
 drivers/scsi/bfa/bfa_core.c                        |   4 +-
 drivers/scsi/bfa/bfa_ioc.c                         |  20 ++--
 drivers/scsi/bfa/bfa_ioc.h                         |  10 +-
 drivers/scsi/bfa/bfa_modules.h                     |   2 +-
 drivers/scsi/bfa/bfad.c                            |   8 +-
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |   4 +-
 drivers/scsi/bnx2fc/bnx2fc_tgt.c                   |   8 +-
 drivers/scsi/bnx2i/bnx2i_hwi.c                     |   2 +-
 drivers/scsi/bnx2i/bnx2i_iscsi.c                   |   8 +-
 drivers/scsi/csiostor/csio_hw.c                    |   6 +-
 drivers/scsi/csiostor/csio_mb.c                    |   2 +-
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c                 |   4 +-
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |   4 +-
 drivers/scsi/dc395x.c                              |   6 +-
 drivers/scsi/elx/efct/efct_xport.c                 |   4 +-
 drivers/scsi/elx/libefc/efc_els.c                  |   4 +-
 drivers/scsi/elx/libefc/efc_fabric.c               |   4 +-
 drivers/scsi/esas2r/esas2r_main.c                  |   4 +-
 drivers/scsi/fcoe/fcoe_ctlr.c                      |  14 +--
 drivers/scsi/fcoe/fcoe_transport.c                 |   4 +-
 drivers/scsi/fnic/fdls_disc.c                      |  16 ++--
 drivers/scsi/fnic/fip.c                            |  30 +++---
 drivers/scsi/fnic/fnic_main.c                      |   6 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c              |   4 +-
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c             |   4 +-
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c             |  14 +--
 drivers/scsi/ibmvscsi/ibmvfc.c                     |  10 +-
 drivers/scsi/ibmvscsi/ibmvscsi.c                   |   4 +-
 drivers/scsi/ipr.c                                 |  16 ++--
 drivers/scsi/isci/host.c                           |   6 +-
 drivers/scsi/isci/isci.h                           |   2 +-
 drivers/scsi/isci/phy.c                            |   2 +-
 drivers/scsi/isci/port.c                           |   2 +-
 drivers/scsi/isci/port_config.c                    |   4 +-
 drivers/scsi/libfc/fc_fcp.c                        |   6 +-
 drivers/scsi/libiscsi.c                            |  12 +--
 drivers/scsi/libsas/sas_expander.c                 |   2 +-
 drivers/scsi/libsas/sas_scsi_host.c                |   6 +-
 drivers/scsi/lpfc/lpfc_ct.c                        |   2 +-
 drivers/scsi/lpfc/lpfc_els.c                       |  20 ++--
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |   4 +-
 drivers/scsi/lpfc/lpfc_init.c                      |  26 +++---
 drivers/scsi/lpfc/lpfc_nportdisc.c                 |  14 +--
 drivers/scsi/lpfc/lpfc_scsi.c                      |   4 +-
 drivers/scsi/lpfc/lpfc_sli.c                       |  26 +++---
 drivers/scsi/lpfc/lpfc_vmid.c                      |   2 +-
 drivers/scsi/megaraid/megaraid_mbox.c              |   6 +-
 drivers/scsi/megaraid/megaraid_mm.c                |   6 +-
 drivers/scsi/megaraid/megaraid_sas_base.c          |   6 +-
 drivers/scsi/mvsas/mv_sas.c                        |   4 +-
 drivers/scsi/ncr53c8xx.c                           |   4 +-
 drivers/scsi/pmcraid.c                             |  18 ++--
 drivers/scsi/qla1280.c                             |   4 +-
 drivers/scsi/qla2xxx/qla_edif.c                    |   4 +-
 drivers/scsi/qla2xxx/qla_init.c                    |   2 +-
 drivers/scsi/qla2xxx/qla_iocb.c                    |   2 +-
 drivers/scsi/qla2xxx/qla_os.c                      |   6 +-
 drivers/scsi/qla4xxx/ql4_os.c                      |   8 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |   6 +-
 drivers/scsi/sym53c8xx_2/sym_glue.c                |   4 +-
 .../staging/gpib/agilent_82357a/agilent_82357a.c   |   6 +-
 drivers/staging/gpib/common/gpib_os.c              |  10 +-
 drivers/staging/gpib/common/iblib.c                |   6 +-
 drivers/staging/gpib/ni_usb/ni_usb_gpib.c          |   6 +-
 drivers/staging/media/imx/imx-ic-prpencvf.c        |   6 +-
 drivers/staging/media/imx/imx-media-csi.c          |   6 +-
 drivers/staging/rtl8723bs/core/rtw_cmd.c           |   8 +-
 drivers/staging/rtl8723bs/core/rtw_mlme.c          |   4 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      |   8 +-
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c       |   4 +-
 drivers/staging/rtl8723bs/core/rtw_recv.c          |   4 +-
 .../rtl8723bs/include/osdep_service_linux.h        |   2 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h   |   2 +-
 drivers/staging/rtl8723bs/os_dep/mlme_linux.c      |   4 +-
 drivers/target/iscsi/iscsi_target_erl0.c           |   4 +-
 drivers/target/iscsi/iscsi_target_erl1.c           |   6 +-
 drivers/target/iscsi/iscsi_target_util.c           |  14 +--
 drivers/target/target_core_user.c                  |   8 +-
 drivers/tty/ipwireless/hardware.c                  |   4 +-
 drivers/tty/mips_ejtag_fdc.c                       |   8 +-
 drivers/tty/moxa.c                                 |   4 +-
 drivers/tty/n_gsm.c                                |  32 +++----
 drivers/tty/serial/8250/8250_aspeed_vuart.c        |   6 +-
 drivers/tty/serial/8250/8250_core.c                |  12 +--
 drivers/tty/serial/altera_uart.c                   |   6 +-
 drivers/tty/serial/amba-pl011.c                    |   8 +-
 drivers/tty/serial/atmel_serial.c                  |   8 +-
 drivers/tty/serial/fsl_lpuart.c                    |   8 +-
 drivers/tty/serial/imx.c                           |   6 +-
 drivers/tty/serial/liteuart.c                      |   6 +-
 drivers/tty/serial/max3100.c                       |   6 +-
 drivers/tty/serial/mux.c                           |   4 +-
 drivers/tty/serial/sa1100.c                        |   6 +-
 drivers/tty/serial/sccnxp.c                        |   6 +-
 drivers/tty/serial/sh-sci.c                        |   4 +-
 drivers/tty/synclink_gt.c                          |   8 +-
 drivers/tty/sysrq.c                                |   4 +-
 drivers/tty/vcc.c                                  |   8 +-
 drivers/tty/vt/keyboard.c                          |   2 +-
 drivers/tty/vt/vt.c                                |   8 +-
 drivers/usb/atm/cxacru.c                           |   6 +-
 drivers/usb/atm/speedtch.c                         |  12 +--
 drivers/usb/atm/usbatm.c                           |   6 +-
 drivers/usb/chipidea/otg_fsm.c                     |   2 +-
 drivers/usb/core/hcd.c                             |  10 +-
 drivers/usb/core/hub.c                             |   4 +-
 drivers/usb/dwc2/core_intr.c                       |   2 +-
 drivers/usb/dwc2/hcd.c                             |   6 +-
 drivers/usb/dwc2/hcd_queue.c                       |   4 +-
 drivers/usb/fotg210/fotg210-hcd.c                  |   4 +-
 drivers/usb/gadget/legacy/zero.c                   |   2 +-
 drivers/usb/gadget/udc/at91_udc.c                  |   6 +-
 drivers/usb/gadget/udc/dummy_hcd.c                 |   4 +-
 drivers/usb/gadget/udc/m66592-udc.c                |  10 +-
 drivers/usb/gadget/udc/omap_udc.c                  |   6 +-
 drivers/usb/gadget/udc/pxa25x_udc.c                |   2 +-
 drivers/usb/gadget/udc/pxa25x_udc.h                |   2 +-
 drivers/usb/gadget/udc/r8a66597-udc.c              |  10 +-
 drivers/usb/gadget/udc/snps_udc_core.c             |  26 +++---
 drivers/usb/host/ehci-hcd.c                        |   2 +-
 drivers/usb/host/ehci-hub.c                        |   4 +-
 drivers/usb/host/ehci-platform.c                   |   6 +-
 drivers/usb/host/isp116x-hcd.c                     |   2 +-
 drivers/usb/host/ohci-hcd.c                        |   6 +-
 drivers/usb/host/oxu210hp-hcd.c                    |   8 +-
 drivers/usb/host/r8a66597-hcd.c                    |  14 +--
 drivers/usb/host/sl811-hcd.c                       |   6 +-
 drivers/usb/host/uhci-hcd.c                        |   4 +-
 drivers/usb/host/uhci-hub.c                        |   2 +-
 drivers/usb/host/uhci-q.c                          |   6 +-
 drivers/usb/host/xen-hcd.c                         |   4 +-
 drivers/usb/host/xhci-hub.c                        |   2 +-
 drivers/usb/host/xhci-ring.c                       |   2 +-
 drivers/usb/host/xhci.c                            |   6 +-
 drivers/usb/isp1760/isp1760-hcd.c                  |   6 +-
 drivers/usb/isp1760/isp1760-udc.c                  |   6 +-
 drivers/usb/misc/usbtest.c                         |   6 +-
 drivers/usb/musb/da8xx.c                           |  12 +--
 drivers/usb/musb/mpfs.c                            |  12 +--
 drivers/usb/musb/musb_core.c                       |   6 +-
 drivers/usb/musb/musb_dsps.c                       |   4 +-
 drivers/usb/musb/musb_virthub.c                    |   2 +-
 drivers/usb/musb/tusb6010.c                        |   4 +-
 drivers/usb/phy/phy-fsl-usb.c                      |   2 +-
 drivers/usb/phy/phy-mv-usb.c                       |   4 +-
 drivers/usb/serial/garmin_gps.c                    |   4 +-
 drivers/usb/serial/mos7840.c                       |   8 +-
 drivers/usb/storage/realtek_cr.c                   |   4 +-
 drivers/usb/usbip/vudc_transfer.c                  |   6 +-
 drivers/video/fbdev/aty/radeon_backlight.c         |   4 +-
 drivers/video/fbdev/aty/radeon_base.c              |   6 +-
 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            |   6 +-
 drivers/watchdog/alim7101_wdt.c                    |   4 +-
 drivers/watchdog/at91sam9_wdt.c                    |   6 +-
 drivers/watchdog/bcm47xx_wdt.c                     |   4 +-
 drivers/watchdog/cpwd.c                            |   2 +-
 drivers/watchdog/lpc18xx_wdt.c                     |   4 +-
 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                           |   6 +-
 drivers/watchdog/via_wdt.c                         |   6 +-
 drivers/watchdog/w83877f_wdt.c                     |   4 +-
 drivers/xen/grant-table.c                          |   4 +-
 fs/afs/server.c                                    |   2 +-
 fs/bcachefs/clock.c                                |   4 +-
 fs/btrfs/zstd.c                                    |   4 +-
 fs/dlm/lock.c                                      |   6 +-
 fs/ext4/super.c                                    |   8 +-
 fs/jbd2/journal.c                                  |   2 +-
 fs/jbd2/transaction.c                              |   2 +-
 fs/lockd/svclock.c                                 |   2 +-
 fs/nilfs2/segment.c                                |   6 +-
 fs/ocfs2/cluster/tcp.c                             |   4 +-
 fs/pstore/platform.c                               |   2 +-
 fs/timerfd.c                                       |   2 +-
 include/clocksource/timer-ti-dm.h                  |   2 +-
 include/linux/hrtimer.h                            |  24 ++---
 include/linux/timer.h                              |  58 ++++++------
 include/linux/torture.h                            |   2 +-
 include/linux/usb/otg-fsm.h                        |   6 +-
 include/linux/workqueue.h                          |   4 +-
 include/net/cfg80211.h                             |   4 +-
 include/rdma/rdmavt_qp.h                           |   2 +-
 include/trace/events/rxrpc.h                       |  16 ++--
 include/trace/events/timer.h                       |  14 +--
 init/main.c                                        |   2 +-
 io_uring/rw.c                                      |   2 +-
 io_uring/timeout.c                                 |   8 +-
 io_uring/timeout.h                                 |   2 +-
 kernel/bpf/helpers.c                               |   2 +-
 kernel/events/uprobes.c                            |   2 +-
 kernel/irq/spurious.c                              |   4 +-
 kernel/kcsan/kcsan_test.c                          |   4 +-
 kernel/kthread.c                                   |   4 +-
 kernel/rcu/rcutorture.c                            |   4 +-
 kernel/rcu/tasks.h                                 |  10 +-
 kernel/rcu/tree_nocb.h                             |   8 +-
 kernel/sched/core.c                                |   2 +-
 kernel/sched/psi.c                                 |   4 +-
 kernel/time/clocksource.c                          |   4 +-
 kernel/time/hrtimer.c                              |  34 +++----
 kernel/time/posix-timers.c                         |   2 +-
 kernel/time/sleep_timeout.c                        |  12 +--
 kernel/time/timer.c                                | 102 ++++++++++-----------
 kernel/torture.c                                   |   2 +-
 kernel/workqueue.c                                 |  28 +++---
 lib/test_ref_tracker.c                             |   2 +-
 mm/oom_kill.c                                      |   2 +-
 mm/page-writeback.c                                |  10 +-
 net/802/garp.c                                     |   4 +-
 net/802/mrp.c                                      |   8 +-
 net/appletalk/aarp.c                               |  10 +-
 net/appletalk/ddp.c                                |   6 +-
 net/atm/clip.c                                     |   4 +-
 net/atm/lec.c                                      |  12 +--
 net/atm/mpc.c                                      |   2 +-
 net/ax25/af_ax25.c                                 |   4 +-
 net/ax25/ax25_ds_timer.c                           |   4 +-
 net/ax25/ax25_timer.c                              |  20 ++--
 net/batman-adv/tp_meter.c                          |   8 +-
 net/bluetooth/hidp/core.c                          |   4 +-
 net/bluetooth/rfcomm/core.c                        |   8 +-
 net/bridge/br_mdb.c                                |  14 +--
 net/bridge/br_multicast.c                          | 102 ++++++++++-----------
 net/bridge/br_multicast_eht.c                      |  10 +-
 net/bridge/br_stp.c                                |  16 ++--
 net/bridge/br_stp_if.c                             |   4 +-
 net/bridge/br_stp_timer.c                          |  18 ++--
 net/can/af_can.c                                   |   2 +-
 net/can/proc.c                                     |   4 +-
 net/core/drop_monitor.c                            |  10 +-
 net/core/gen_estimator.c                           |   6 +-
 net/core/neighbour.c                               |  12 +--
 net/core/sock.c                                    |   2 +-
 net/dccp/ccids/ccid2.c                             |   2 +-
 net/dccp/ccids/ccid3.c                             |   2 +-
 net/dccp/timer.c                                   |   8 +-
 net/hsr/hsr_device.c                               |  16 ++--
 net/hsr/hsr_framereg.c                             |   8 +-
 net/ieee802154/6lowpan/reassembly.c                |   2 +-
 net/ipv4/igmp.c                                    |  14 +--
 net/ipv4/inet_connection_sock.c                    |  10 +-
 net/ipv4/inet_fragment.c                           |   2 +-
 net/ipv4/inet_timewait_sock.c                      |   8 +-
 net/ipv4/ip_fragment.c                             |   4 +-
 net/ipv4/ipmr.c                                    |   8 +-
 net/ipv4/tcp.c                                     |   4 +-
 net/ipv4/tcp_minisocks.c                           |   2 +-
 net/ipv4/tcp_timer.c                               |   6 +-
 net/ipv6/addrconf.c                                |   4 +-
 net/ipv6/ip6_fib.c                                 |  10 +-
 net/ipv6/ip6_flowlabel.c                           |   4 +-
 net/ipv6/ip6mr.c                                   |   6 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c            |   2 +-
 net/ipv6/reassembly.c                              |   2 +-
 net/lapb/lapb_timer.c                              |   8 +-
 net/llc/llc_c_ac.c                                 |  20 ++--
 net/mac80211/agg-rx.c                              |   8 +-
 net/mac80211/agg-tx.c                              |  10 +-
 net/mac80211/ibss.c                                |   8 +-
 net/mac80211/led.c                                 |   6 +-
 net/mac80211/mesh.c                                |  10 +-
 net/mac80211/mesh_hwmp.c                           |   6 +-
 net/mac80211/mesh_plink.c                          |   6 +-
 net/mac80211/mlme.c                                |  26 +++---
 net/mac80211/ocb.c                                 |   4 +-
 net/mac80211/offchannel.c                          |   2 +-
 net/mac80211/rx.c                                  |   6 +-
 net/mac80211/sta_info.c                            |   4 +-
 net/mac80211/status.c                              |   4 +-
 net/mac80211/tx.c                                  |   4 +-
 net/mac80211/util.c                                |   2 +-
 net/mctp/af_mctp.c                                 |   2 +-
 net/mptcp/pm.c                                     |  20 ++--
 net/mptcp/protocol.c                               |   4 +-
 net/ncsi/ncsi-cmd.c                                |   2 +-
 net/ncsi/ncsi-manage.c                             |   8 +-
 net/netfilter/ipset/ip_set_bitmap_gen.h            |   6 +-
 net/netfilter/ipset/ip_set_list_set.c              |   6 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |   8 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |   6 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |   6 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |   6 +-
 net/netfilter/nf_conntrack_expect.c                |   4 +-
 net/netfilter/nf_conntrack_h323_main.c             |   2 +-
 net/netfilter/nf_conntrack_netlink.c               |   2 +-
 net/netfilter/nf_conntrack_sip.c                   |   2 +-
 net/netfilter/nfnetlink_log.c                      |   4 +-
 net/netfilter/xt_IDLETIMER.c                       |  14 +--
 net/netfilter/xt_LED.c                             |   4 +-
 net/netrom/af_netrom.c                             |   4 +-
 net/netrom/nr_loopback.c                           |   4 +-
 net/netrom/nr_timer.c                              |  10 +-
 net/nfc/core.c                                     |   8 +-
 net/nfc/hci/core.c                                 |   4 +-
 net/nfc/hci/llc_shdlc.c                            |  14 +--
 net/nfc/llcp_commands.c                            |   2 +-
 net/nfc/llcp_core.c                                |  10 +-
 net/nfc/nci/core.c                                 |   8 +-
 net/packet/af_packet.c                             |   4 +-
 net/rose/af_rose.c                                 |   4 +-
 net/rose/rose_link.c                               |   6 +-
 net/rose/rose_loopback.c                           |   4 +-
 net/rose/rose_timer.c                              |   6 +-
 net/rxrpc/ar-internal.h                            |   4 +-
 net/rxrpc/call_event.c                             |   2 +-
 net/rxrpc/call_object.c                            |   2 +-
 net/rxrpc/input.c                                  |   4 +-
 net/rxrpc/input_rack.c                             |  10 +-
 net/rxrpc/output.c                                 |   2 +-
 net/sched/cls_flow.c                               |   6 +-
 net/sched/sch_fq_pie.c                             |   6 +-
 net/sched/sch_generic.c                            |   6 +-
 net/sched/sch_pie.c                                |   6 +-
 net/sched/sch_red.c                                |   6 +-
 net/sched/sch_sfq.c                                |   6 +-
 net/sctp/associola.c                               |   2 +-
 net/sctp/input.c                                   |   2 +-
 net/sctp/output.c                                  |   2 +-
 net/sctp/outqueue.c                                |   2 +-
 net/sctp/protocol.c                                |   6 +-
 net/sctp/sm_sideeffect.c                           |  42 ++++-----
 net/sctp/transport.c                               |  12 +--
 net/sunrpc/svc_xprt.c                              |   8 +-
 net/sunrpc/xprt.c                                  |   6 +-
 net/tipc/discover.c                                |  12 +--
 net/tipc/monitor.c                                 |   6 +-
 net/tipc/node.c                                    |   8 +-
 net/tipc/socket.c                                  |   2 +-
 net/tipc/subscr.c                                  |   4 +-
 net/wireless/core.c                                |   4 +-
 net/x25/af_x25.c                                   |   4 +-
 net/x25/x25_link.c                                 |   4 +-
 net/x25/x25_timer.c                                |  14 +--
 net/xfrm/xfrm_policy.c                             |  14 +--
 net/xfrm/xfrm_replay.c                             |   6 +-
 net/xfrm/xfrm_state.c                              |   4 +-
 rust/kernel/time/hrtimer.rs                        |  36 ++++----
 rust/kernel/time/hrtimer/arc.rs                    |   2 +-
 rust/kernel/time/hrtimer/pin.rs                    |   2 +-
 rust/kernel/time/hrtimer/pin_mut.rs                |   2 +-
 rust/kernel/time/hrtimer/tbox.rs                   |   2 +-
 samples/connector/cn_test.c                        |   4 +-
 samples/ftrace/sample-trace-array.c                |   4 +-
 security/keys/gc.c                                 |   2 +-
 sound/core/timer.c                                 |   4 +-
 sound/drivers/aloop.c                              |   4 +-
 sound/drivers/dummy.c                              |   4 +-
 sound/drivers/mpu401/mpu401_uart.c                 |   6 +-
 sound/drivers/mtpav.c                              |   6 +-
 sound/drivers/opl3/opl3_midi.c                     |   6 +-
 sound/drivers/pcmtest.c                            |   6 +-
 sound/drivers/serial-u16550.c                      |   4 +-
 sound/i2c/other/ak4117.c                           |   6 +-
 sound/isa/sb/emu8000_pcm.c                         |   6 +-
 sound/isa/sb/sb8_midi.c                            |   6 +-
 sound/isa/wavefront/wavefront_midi.c               |   6 +-
 sound/pci/asihpi/asihpi.c                          |   6 +-
 sound/pci/ctxfi/cttimer.c                          |   8 +-
 sound/pci/echoaudio/midi.c                         |   4 +-
 sound/pci/korg1212/korg1212.c                      |   6 +-
 sound/pci/rme9652/hdsp.c                           |   6 +-
 sound/pci/rme9652/hdspm.c                          |   6 +-
 sound/sh/aica.c                                    |   8 +-
 sound/soc/codecs/rt5645.c                          |   4 +-
 sound/soc/fsl/imx-pcm-rpmsg.c                      |   4 +-
 sound/soc/ti/ams-delta.c                           |   2 +-
 sound/synth/emux/emux_synth.c                      |   6 +-
 sound/usb/midi.c                                   |   6 +-
 tools/sched_ext/scx_qmap.bpf.c                     |   4 +-
 tools/testing/selftests/bpf/progs/test_vmlinux.c   |   4 +-
 981 files changed, 3126 insertions(+), 3126 deletions(-)
Signature · 1 line
2.45.2
#1 lore raw

PATCH 1/17 rust: Rename timer_container_of() to hrtimer_container_of()

This primitive is dealing with 'struct hrtimer' objects, not 'struct timer_list' objects - so clarify the name.

We want to introduce the timer_container_of() symbol in the kernel for timer_list, make sure there's no clash of namespaces, at least on the conceptual plane.

Cc Alex Gaynor <[email protected]>
Cc Andreas Hindborg <[email protected]>
Cc Anna-Maria Behnsen <[email protected]>
Cc Boqun Feng <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Lyude Paul <[email protected]>
Cc Miguel Ojeda <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 rust/kernel/time/hrtimer.rs         | 4 ++--
 rust/kernel/time/hrtimer/arc.rs     | 2 +-
 rust/kernel/time/hrtimer/pin.rs     | 2 +-
 rust/kernel/time/hrtimer/pin_mut.rs | 2 +-
 rust/kernel/time/hrtimer/tbox.rs    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
rust/kernel/time/hrtimer.rs +2 -2
index ce53f8579d18..f3fb7a0caf2f 100644
@@ -338,7 +338,7 @@ pub unsafe trait HasHrTimer<T> {
     /// # Safety
     ///
     /// `ptr` must point to a [`HrTimer<T>`] field in a struct of type `Self`.
-    unsafe fn timer_container_of(ptr: *mut HrTimer<T>) -> *mut Self
+    unsafe fn hrtimer_container_of(ptr: *mut HrTimer<T>) -> *mut Self
     where
         Self: Sized;
 
@@ -498,7 +498,7 @@ unsafe fn raw_get_timer(
             }
 
             #[inline]
-            unsafe fn timer_container_of(
+            unsafe fn hrtimer_container_of(
                 ptr: *mut $crate::time::hrtimer::HrTimer<$timer_type>,
             ) -> *mut Self {
                 // SAFETY: As per the safety requirement of this function, `ptr`
rust/kernel/time/hrtimer/arc.rs +1 -1
index 4a984d85b4a1..5cfe6c27795f 100644
@@ -80,7 +80,7 @@ impl<T> RawHrTimerCallback for Arc<T>
 
         // SAFETY: By C API contract `ptr` is the pointer we passed when
         // queuing the timer, so it is a `HrTimer<T>` embedded in a `T`.
-        let data_ptr = unsafe { T::timer_container_of(timer_ptr) };
+        let data_ptr = unsafe { T::hrtimer_container_of(timer_ptr) };
 
         // SAFETY:
         //  - `data_ptr` is derived form the pointer to the `T` that was used to
rust/kernel/time/hrtimer/pin.rs +1 -1
index f760db265c7b..d16a676b0639 100644
@@ -83,7 +83,7 @@ impl<'a, T> RawHrTimerCallback for Pin<&'a T>
 
         // SAFETY: By the safety requirement of this function, `timer_ptr`
         // points to a `HrTimer<T>` contained in an `T`.
-        let receiver_ptr = unsafe { T::timer_container_of(timer_ptr) };
+        let receiver_ptr = unsafe { T::hrtimer_container_of(timer_ptr) };
 
         // SAFETY:
         //  - By the safety requirement of this function, `timer_ptr`
rust/kernel/time/hrtimer/pin_mut.rs +1 -1
index 90c0351d62e4..17c68f8fbb37 100644
@@ -87,7 +87,7 @@ impl<'a, T> RawHrTimerCallback for Pin<&'a mut T>
 
         // SAFETY: By the safety requirement of this function, `timer_ptr`
         // points to a `HrTimer<T>` contained in an `T`.
-        let receiver_ptr = unsafe { T::timer_container_of(timer_ptr) };
+        let receiver_ptr = unsafe { T::hrtimer_container_of(timer_ptr) };
 
         // SAFETY:
         //  - By the safety requirement of this function, `timer_ptr`
rust/kernel/time/hrtimer/tbox.rs +1 -1
index 2071cae07234..9dace895ce58 100644
@@ -103,7 +103,7 @@ impl<T, A> RawHrTimerCallback for Pin<Box<T, A>>
 
         // SAFETY: By C API contract `ptr` is the pointer we passed when
         // queuing the timer, so it is a `HrTimer<T>` embedded in a `T`.
-        let data_ptr = unsafe { T::timer_container_of(timer_ptr) };
+        let data_ptr = unsafe { T::hrtimer_container_of(timer_ptr) };
 
         // SAFETY:
         //  - As per the safety requirements of the trait `HrTimerHandle`, the
Signature · 1 line
2.45.2
#2 lore raw

PATCH 2/17 scsi: bfa: Rename 'timer_mod' to 'timer_module'

In reply to Ingo Molnar

We'd like to introduce timer_mod() in the kernel, so make sure the namespace is clear.

Cc Anil Gurumurthy <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
Cc Sudarsana Kalluru <[email protected]>
---
 arch/arm/mach-omap1/pm.c                         |  2 +-
 arch/arm/mach-s3c/s3c64xx.c                      |  4 +--
 arch/arm/mach-s3c/s3c64xx.h                      |  6 ++---
 arch/x86/kvm/cpuid.c                             |  4 +--
 arch/x86/kvm/lapic.c                             | 18 ++++++-------
 arch/x86/kvm/lapic.h                             |  4 +--
 drivers/clocksource/timer-ti-32k.c               |  4 +--
 drivers/clocksource/timer-ti-dm.c                |  6 ++---
 drivers/comedi/drivers/addi_apci_3120.c          | 20 +++++++-------
 drivers/comedi/drivers/addi_apci_3501.c          |  2 +-
 drivers/counter/rz-mtu3-cnt.c                    | 16 +++++------
 drivers/fpga/dfl-n3000-nios.c                    | 20 +++++++-------
 drivers/gpu/drm/msm/msm_drv.h                    |  4 +--
 drivers/gpu/drm/msm/msm_io_utils.c               |  4 +--
 drivers/leds/leds-netxbig.c                      |  4 +--
 drivers/scsi/bfa/bfa.h                           |  2 +-
 drivers/scsi/bfa/bfa_core.c                      |  4 +--
 drivers/scsi/bfa/bfa_ioc.c                       | 20 +++++++-------
 drivers/scsi/bfa/bfa_ioc.h                       | 10 +++----
 drivers/scsi/bfa/bfa_modules.h                   |  2 +-
 drivers/scsi/bfa/bfad.c                          |  2 +-
 fs/timerfd.c                                     |  2 +-
 include/clocksource/timer-ti-dm.h                |  2 +-
 include/linux/hrtimer.h                          | 24 ++++++++---------
 include/linux/torture.h                          |  2 +-
 include/trace/events/rxrpc.h                     | 16 +++++------
 include/trace/events/timer.h                     | 14 +++++-----
 io_uring/rw.c                                    |  2 +-
 io_uring/timeout.c                               |  8 +++---
 io_uring/timeout.h                               |  2 +-
 kernel/bpf/helpers.c                             |  2 +-
 kernel/time/hrtimer.c                            | 34 ++++++++++++------------
 kernel/time/posix-timers.c                       |  2 +-
 kernel/time/sleep_timeout.c                      |  6 ++---
 kernel/torture.c                                 |  2 +-
 net/rxrpc/ar-internal.h                          |  4 +--
 net/rxrpc/call_event.c                           |  2 +-
 net/rxrpc/input.c                                |  4 +--
 net/rxrpc/input_rack.c                           | 10 +++----
 net/rxrpc/output.c                               |  2 +-
 rust/kernel/time/hrtimer.rs                      | 32 +++++++++++-----------
 tools/testing/selftests/bpf/progs/test_vmlinux.c |  4 +--
 42 files changed, 167 insertions(+), 167 deletions(-)
arch/arm/mach-omap1/pm.c +1 -1
index 6a5815aa05e6..ce9295ca2960 100644
@@ -118,7 +118,7 @@ void omap1_pm_idle(void)
 #endif
 
 #ifdef CONFIG_OMAP_DM_TIMER
-	use_idlect1 = omap_dm_timer_modify_idlect_mask(use_idlect1);
+	use_idlect1 = omap_dm_timer_moduleify_idlect_mask(use_idlect1);
 #endif
 
 	if (omap_dma_running())
arch/arm/mach-s3c/s3c64xx.c +2 -2
index 6c70ea7f2931..6c1d020b181e 100644
@@ -165,8 +165,8 @@ static struct samsung_pwm_variant s3c64xx_pwm_variant = {
 	.tclk_mask	= (1 << 7) | (1 << 6) | (1 << 5),
 };
 
-void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
-				     enum s3c64xx_timer_mode source)
+void __init s3c64xx_set_timer_source(enum s3c64xx_timer_modulee event,
+				     enum s3c64xx_timer_modulee source)
 {
 	s3c64xx_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
 	s3c64xx_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
arch/arm/mach-s3c/s3c64xx.h +3 -3
index 0505728f3f7b..f719e16d2a84 100644
@@ -40,7 +40,7 @@ extern struct pl08x_platform_data s3c64xx_dma1_plat_data;
 #endif
 
 /* Samsung HR-Timer Clock mode */
-enum s3c64xx_timer_mode {
+enum s3c64xx_timer_modulee {
 	S3C64XX_PWM0,
 	S3C64XX_PWM1,
 	S3C64XX_PWM2,
@@ -48,8 +48,8 @@ enum s3c64xx_timer_mode {
 	S3C64XX_PWM4,
 };
 
-extern void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
-					    enum s3c64xx_timer_mode source);
+extern void __init s3c64xx_set_timer_source(enum s3c64xx_timer_modulee event,
+					    enum s3c64xx_timer_modulee source);
 extern void __init s3c64xx_timer_init(void);
 
 #endif /* __ARCH_ARM_MACH_S3C64XX_COMMON_H */
arch/x86/kvm/cpuid.c +2 -2
index 571c906ffcbf..a5bc09602726 100644
@@ -444,9 +444,9 @@ void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
 	best = kvm_find_cpuid_entry(vcpu, 1);
 	if (best && apic) {
 		if (cpuid_entry_has(best, X86_FEATURE_TSC_DEADLINE_TIMER))
-			apic->lapic_timer.timer_mode_mask = 3 << 17;
+			apic->lapic_timer.timer_modulee_mask = 3 << 17;
 		else
-			apic->lapic_timer.timer_mode_mask = 1 << 17;
+			apic->lapic_timer.timer_modulee_mask = 1 << 17;
 
 		kvm_apic_set_version(vcpu);
 	}
arch/x86/kvm/lapic.c +9 -9
index 28e3317124fd..9edcbc72c119 100644
@@ -546,17 +546,17 @@ static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
 
 static inline int apic_lvtt_oneshot(struct kvm_lapic *apic)
 {
-	return apic->lapic_timer.timer_mode == APIC_LVT_TIMER_ONESHOT;
+	return apic->lapic_timer.timer_modulee == APIC_LVT_TIMER_ONESHOT;
 }
 
 static inline int apic_lvtt_period(struct kvm_lapic *apic)
 {
-	return apic->lapic_timer.timer_mode == APIC_LVT_TIMER_PERIODIC;
+	return apic->lapic_timer.timer_modulee == APIC_LVT_TIMER_PERIODIC;
 }
 
 static inline int apic_lvtt_tscdeadline(struct kvm_lapic *apic)
 {
-	return apic->lapic_timer.timer_mode == APIC_LVT_TIMER_TSCDEADLINE;
+	return apic->lapic_timer.timer_modulee == APIC_LVT_TIMER_TSCDEADLINE;
 }
 
 static inline int apic_lvt_nmi_mode(u32 lvt_val)
@@ -1766,18 +1766,18 @@ static void cancel_apic_timer(struct kvm_lapic *apic)
 
 static void apic_update_lvtt(struct kvm_lapic *apic)
 {
-	u32 timer_mode = kvm_lapic_get_reg(apic, APIC_LVTT) &
-			apic->lapic_timer.timer_mode_mask;
+	u32 timer_modulee = kvm_lapic_get_reg(apic, APIC_LVTT) &
+			apic->lapic_timer.timer_modulee_mask;
 
-	if (apic->lapic_timer.timer_mode != timer_mode) {
-		if (apic_lvtt_tscdeadline(apic) != (timer_mode ==
+	if (apic->lapic_timer.timer_modulee != timer_modulee) {
+		if (apic_lvtt_tscdeadline(apic) != (timer_modulee ==
 				APIC_LVT_TIMER_TSCDEADLINE)) {
 			cancel_apic_timer(apic);
 			kvm_lapic_set_reg(apic, APIC_TMICT, 0);
 			apic->lapic_timer.period = 0;
 			apic->lapic_timer.tscdeadline = 0;
 		}
-		apic->lapic_timer.timer_mode = timer_mode;
+		apic->lapic_timer.timer_modulee = timer_modulee;
 		limit_periodic_timer_frequency(apic);
 	}
 }
@@ -2358,7 +2358,7 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
 	case APIC_LVTT:
 		if (!kvm_apic_sw_enabled(apic))
 			val |= APIC_LVT_MASKED;
-		val &= (apic_lvt_mask[LVT_TIMER] | apic->lapic_timer.timer_mode_mask);
+		val &= (apic_lvt_mask[LVT_TIMER] | apic->lapic_timer.timer_modulee_mask);
 		kvm_lapic_set_reg(apic, APIC_LVTT, val);
 		apic_update_lvtt(apic);
 		break;
arch/x86/kvm/lapic.h +2 -2
index 1a8553ebdb42..36644941e7d3 100644
@@ -46,8 +46,8 @@ struct kvm_timer {
 	struct hrtimer timer;
 	s64 period; 				/* unit: ns */
 	ktime_t target_expiration;
-	u32 timer_mode;
-	u32 timer_mode_mask;
+	u32 timer_modulee;
+	u32 timer_modulee_mask;
 	u64 tscdeadline;
 	u64 expired_tscdeadline;
 	u32 timer_advance_ns;
drivers/clocksource/timer-ti-32k.c +2 -2
index a86529a70737..761cd798ffe9 100644
@@ -102,7 +102,7 @@ static void __init ti_32k_timer_enable_clock(struct device_node *np,
 	}
 }
 
-static void __init ti_32k_timer_module_init(struct device_node *np,
+static void __init ti_32k_timer_moduleule_init(struct device_node *np,
 					    void __iomem *base)
 {
 	void __iomem *sysc = base + 4;
@@ -134,7 +134,7 @@ static int __init ti_32k_timer_init(struct device_node *np)
 		ti_32k_timer.cs.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;
 
 	ti_32k_timer.counter = ti_32k_timer.base;
-	ti_32k_timer_module_init(np, ti_32k_timer.base);
+	ti_32k_timer_moduleule_init(np, ti_32k_timer.base);
 
 	/*
 	 * 32k sync Counter IP register offsets vary between the highlander
drivers/clocksource/timer-ti-dm.c +3 -3
index e9e32df6b566..2f4ece5cd5c9 100644
@@ -687,10 +687,10 @@ static struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *cookie)
 }
 
 /**
- * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR
+ * omap_dm_timer_moduleify_idlect_mask - Check if any running timers use ARMXOR
  * @inputmask: current value of idlect mask
  */
-__u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
+__u32 omap_dm_timer_moduleify_idlect_mask(__u32 inputmask)
 {
 	int i = 0;
 	struct dmtimer *timer = NULL;
@@ -730,7 +730,7 @@ static struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *cookie)
 	return NULL;
 }
 
-__u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
+__u32 omap_dm_timer_moduleify_idlect_mask(__u32 inputmask)
 {
 	BUG();
 
drivers/comedi/drivers/addi_apci_3120.c +10 -10
index 28a242e69721..74187186d098 100644
@@ -149,7 +149,7 @@ struct apci3120_private {
 	unsigned int cur_dmabuf:1;
 	struct apci3120_dmabuf dmabuf[2];
 	unsigned char do_bits;
-	unsigned char timer_mode;
+	unsigned char timer_modulee;
 	unsigned char mode;
 	unsigned short ctrl;
 };
@@ -358,9 +358,9 @@ static void apci3120_timer_set_mode(struct comedi_device *dev,
 {
 	struct apci3120_private *devpriv = dev->private;
 
-	devpriv->timer_mode &= ~APCI3120_TIMER_MODE_MASK(timer);
-	devpriv->timer_mode |= APCI3120_TIMER_MODE(timer, mode);
-	outb(devpriv->timer_mode, dev->iobase + APCI3120_TIMER_MODE_REG);
+	devpriv->timer_modulee &= ~APCI3120_TIMER_MODE_MASK(timer);
+	devpriv->timer_modulee |= APCI3120_TIMER_MODE(timer, mode);
+	outb(devpriv->timer_modulee, dev->iobase + APCI3120_TIMER_MODE_REG);
 }
 
 static void apci3120_timer_enable(struct comedi_device *dev,
@@ -822,7 +822,7 @@ static int apci3120_timer_insn_config(struct comedi_device *dev,
 	unsigned int divisor;
 	unsigned int status;
 	unsigned int mode;
-	unsigned int timer_mode;
+	unsigned int timer_modulee;
 
 	switch (data[0]) {
 	case INSN_CONFIG_ARM:
@@ -858,26 +858,26 @@ static int apci3120_timer_insn_config(struct comedi_device *dev,
 		switch (data[1]) {
 		case I8254_MODE0:
 			mode = APCI3120_MODE_TIMER2_AS_COUNTER;
-			timer_mode = APCI3120_TIMER_MODE0;
+			timer_modulee = APCI3120_TIMER_MODE0;
 			break;
 		case I8254_MODE2:
 			mode = APCI3120_MODE_TIMER2_AS_TIMER;
-			timer_mode = APCI3120_TIMER_MODE2;
+			timer_modulee = APCI3120_TIMER_MODE2;
 			break;
 		case I8254_MODE4:
 			mode = APCI3120_MODE_TIMER2_AS_TIMER;
-			timer_mode = APCI3120_TIMER_MODE4;
+			timer_modulee = APCI3120_TIMER_MODE4;
 			break;
 		case I8254_MODE5:
 			mode = APCI3120_MODE_TIMER2_AS_WDOG;
-			timer_mode = APCI3120_TIMER_MODE5;
+			timer_modulee = APCI3120_TIMER_MODE5;
 			break;
 		default:
 			return -EINVAL;
 		}
 		apci3120_timer_enable(dev, 2, false);
 		apci3120_clr_timer2_interrupt(dev);
-		apci3120_timer_set_mode(dev, 2, timer_mode);
+		apci3120_timer_set_mode(dev, 2, timer_modulee);
 		devpriv->mode &= ~APCI3120_MODE_TIMER2_AS_MASK;
 		devpriv->mode |= mode;
 		outb(devpriv->mode, dev->iobase + APCI3120_MODE_REG);
drivers/comedi/drivers/addi_apci_3501.c +1 -1
index ecb5552f1785..9c4f59c54519 100644
@@ -82,7 +82,7 @@
 
 struct apci3501_private {
 	unsigned long amcc;
-	unsigned char timer_mode;
+	unsigned char timer_modulee;
 };
 
 static const struct comedi_lrange apci3501_ao_range = {
drivers/counter/rz-mtu3-cnt.c +8 -8
index e755d54dfece..e7b4769f340c 100644
@@ -202,13 +202,13 @@ static int rz_mtu3_count_function_read_helper(struct rz_mtu3_channel *const ch,
 					      struct rz_mtu3_cnt *const priv,
 					      enum counter_function *function)
 {
-	u8 timer_mode;
+	u8 timer_modulee;
 
 	pm_runtime_get_sync(ch->dev);
-	timer_mode = rz_mtu3_8bit_ch_read(ch, RZ_MTU3_TMDR1);
+	timer_modulee = rz_mtu3_8bit_ch_read(ch, RZ_MTU3_TMDR1);
 	pm_runtime_put(ch->dev);
 
-	switch (timer_mode & RZ_MTU3_TMDR1_PH_CNT_MODE_MASK) {
+	switch (timer_modulee & RZ_MTU3_TMDR1_PH_CNT_MODE_MASK) {
 	case RZ_MTU3_TMDR1_PH_CNT_MODE_1:
 		*function = COUNTER_FUNCTION_QUADRATURE_X4;
 		return 0;
@@ -252,7 +252,7 @@ static int rz_mtu3_count_function_write(struct counter_device *counter,
 {
 	struct rz_mtu3_channel *const ch = rz_mtu3_get_ch(counter, count->id);
 	struct rz_mtu3_cnt *const priv = counter_priv(counter);
-	u8 timer_mode;
+	u8 timer_modulee;
 	int ret;
 
 	ret = rz_mtu3_lock_if_count_is_enabled(ch, priv, count->id);
@@ -261,13 +261,13 @@ static int rz_mtu3_count_function_write(struct counter_device *counter,
 
 	switch (function) {
 	case COUNTER_FUNCTION_QUADRATURE_X4:
-		timer_mode = RZ_MTU3_TMDR1_PH_CNT_MODE_1;
+		timer_modulee = RZ_MTU3_TMDR1_PH_CNT_MODE_1;
 		break;
 	case COUNTER_FUNCTION_PULSE_DIRECTION:
-		timer_mode = RZ_MTU3_TMDR1_PH_CNT_MODE_2;
+		timer_modulee = RZ_MTU3_TMDR1_PH_CNT_MODE_2;
 		break;
 	case COUNTER_FUNCTION_QUADRATURE_X2_B:
-		timer_mode = RZ_MTU3_TMDR1_PH_CNT_MODE_4;
+		timer_modulee = RZ_MTU3_TMDR1_PH_CNT_MODE_4;
 		break;
 	default:
 		/*
@@ -280,7 +280,7 @@ static int rz_mtu3_count_function_write(struct counter_device *counter,
 	}
 
 	pm_runtime_get_sync(ch->dev);
-	rz_mtu3_8bit_ch_write(ch, RZ_MTU3_TMDR1, timer_mode);
+	rz_mtu3_8bit_ch_write(ch, RZ_MTU3_TMDR1, timer_modulee);
 	pm_runtime_put(ch->dev);
 	mutex_unlock(&priv->lock);
 
drivers/fpga/dfl-n3000-nios.c +10 -10
index 9ddf1d1d392f..18bd45bf21fe 100644
@@ -183,12 +183,12 @@ static DEVICE_ATTR_RO(nios_fw_version);
 	(FIELD_GET(N3000_NIOS_PKVL_MODE_STS_GROUP_MSK, (mode_stat)) ==	\
 	 N3000_NIOS_PKVL_MODE_STS_GROUP_OK)
 
-#define IS_RETIMER_FEC_SUPPORTED(retimer_mode)			\
-	((retimer_mode) != N3000_NIOS_PKVL_MODE_ID_RESET &&	\
-	 (retimer_mode) != N3000_NIOS_PKVL_MODE_ID_4X10G)
+#define IS_RETIMER_FEC_SUPPORTED(retimer_modulee)			\
+	((retimer_modulee) != N3000_NIOS_PKVL_MODE_ID_RESET &&	\
+	 (retimer_modulee) != N3000_NIOS_PKVL_MODE_ID_4X10G)
 
-static int get_retimer_mode(struct n3000_nios *nn, unsigned int mode_stat_reg,
-			    unsigned int *retimer_mode)
+static int get_retimer_modulee(struct n3000_nios *nn, unsigned int mode_stat_reg,
+			    unsigned int *retimer_modulee)
 {
 	unsigned int val;
 	int ret;
@@ -200,7 +200,7 @@ static int get_retimer_mode(struct n3000_nios *nn, unsigned int mode_stat_reg,
 	if (!IS_MODE_STATUS_OK(val))
 		return -EFAULT;
 
-	*retimer_mode = FIELD_GET(N3000_NIOS_PKVL_MODE_STS_ID_MSK, val);
+	*retimer_modulee = FIELD_GET(N3000_NIOS_PKVL_MODE_STS_ID_MSK, val);
 
 	return 0;
 }
@@ -212,7 +212,7 @@ static ssize_t retimer_A_mode_show(struct device *dev,
 	unsigned int mode;
 	int ret;
 
-	ret = get_retimer_mode(nn, N3000_NIOS_PKVL_A_MODE_STS, &mode);
+	ret = get_retimer_modulee(nn, N3000_NIOS_PKVL_A_MODE_STS, &mode);
 	if (ret)
 		return ret;
 
@@ -227,7 +227,7 @@ static ssize_t retimer_B_mode_show(struct device *dev,
 	unsigned int mode;
 	int ret;
 
-	ret = get_retimer_mode(nn, N3000_NIOS_PKVL_B_MODE_STS, &mode);
+	ret = get_retimer_modulee(nn, N3000_NIOS_PKVL_B_MODE_STS, &mode);
 	if (ret)
 		return ret;
 
@@ -251,11 +251,11 @@ static ssize_t fec_mode_show(struct device *dev,
 		return sysfs_emit(buf, "not supported\n");
 
 	/* If no 25G links, FEC mode setting is not supported either */
-	ret = get_retimer_mode(nn, N3000_NIOS_PKVL_A_MODE_STS, &retimer_a_mode);
+	ret = get_retimer_modulee(nn, N3000_NIOS_PKVL_A_MODE_STS, &retimer_a_mode);
 	if (ret)
 		return ret;
 
-	ret = get_retimer_mode(nn, N3000_NIOS_PKVL_B_MODE_STS, &retimer_b_mode);
+	ret = get_retimer_modulee(nn, N3000_NIOS_PKVL_B_MODE_STS, &retimer_b_mode);
 	if (ret)
 		return ret;
 
drivers/gpu/drm/msm/msm_drv.h +2 -2
index a65077855201..ab30b94fa041 100644
@@ -500,12 +500,12 @@ struct msm_hrtimer_work {
 
 void msm_hrtimer_queue_work(struct msm_hrtimer_work *work,
 			    ktime_t wakeup_time,
-			    enum hrtimer_mode mode);
+			    enum hrtimer_modulee mode);
 void msm_hrtimer_work_init(struct msm_hrtimer_work *work,
 			   struct kthread_worker *worker,
 			   kthread_work_func_t fn,
 			   clockid_t clock_id,
-			   enum hrtimer_mode mode);
+			   enum hrtimer_modulee mode);
 
 /* Helper for returning a UABI error with optional logging which can make
  * it easier for userspace to understand what it is doing wrong.
drivers/gpu/drm/msm/msm_io_utils.c +2 -2
index a6efe1eac271..480df853ea3b 100644
@@ -124,7 +124,7 @@ static enum hrtimer_restart msm_hrtimer_worktimer(struct hrtimer *t)
 
 void msm_hrtimer_queue_work(struct msm_hrtimer_work *work,
 			    ktime_t wakeup_time,
-			    enum hrtimer_mode mode)
+			    enum hrtimer_modulee mode)
 {
 	hrtimer_start(&work->timer, wakeup_time, mode);
 }
@@ -133,7 +133,7 @@ void msm_hrtimer_work_init(struct msm_hrtimer_work *work,
 			   struct kthread_worker *worker,
 			   kthread_work_func_t fn,
 			   clockid_t clock_id,
-			   enum hrtimer_mode mode)
+			   enum hrtimer_modulee mode)
 {
 	hrtimer_setup(&work->timer, msm_hrtimer_worktimer, clock_id, mode);
 	work->worker = worker;
drivers/leds/leds-netxbig.c +2 -2
index e95287416ef8..426a9f85da60 100644
@@ -117,7 +117,7 @@ struct netxbig_led_data {
 	spinlock_t		lock;
 };
 
-static int netxbig_led_get_timer_mode(enum netxbig_led_mode *mode,
+static int netxbig_led_get_timer_modulee(enum netxbig_led_mode *mode,
 				      unsigned long delay_on,
 				      unsigned long delay_off,
 				      struct netxbig_led_timer *timer,
@@ -146,7 +146,7 @@ static int netxbig_led_blink_set(struct led_classdev *led_cdev,
 	int ret;
 
 	/* Look for a LED mode with the requested timer frequency. */
-	ret = netxbig_led_get_timer_mode(&mode, *delay_on, *delay_off,
+	ret = netxbig_led_get_timer_modulee(&mode, *delay_on, *delay_off,
 					 led_dat->timer, led_dat->num_timer);
 	if (ret < 0)
 		return ret;
drivers/scsi/bfa/bfa.h +1 -1
index a6b8c4ddea19..80b75669fc50 100644
@@ -429,7 +429,7 @@ bfa_status_t bfa_iocfc_israttr_set(struct bfa_s *bfa,
 void bfa_iocfc_enable(struct bfa_s *bfa);
 void bfa_iocfc_disable(struct bfa_s *bfa);
 #define bfa_timer_start(_bfa, _timer, _timercb, _arg, _timeout)		\
-	bfa_timer_begin(&(_bfa)->timer_mod, _timer, _timercb, _arg, _timeout)
+	bfa_timer_begin(&(_bfa)->timer_module, _timer, _timercb, _arg, _timeout)
 
 struct bfa_cb_pending_q_s {
 	struct bfa_cb_qe_s	hcb_qe;
drivers/scsi/bfa/bfa_core.c +2 -2
index a99a101b95ef..667a631a2abc 100644
@@ -1526,14 +1526,14 @@ bfa_iocfc_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
 	bfa_iocfc_cbfn.reset_cbfn = bfa_iocfc_reset_cbfn;
 
 	ioc->trcmod = bfa->trcmod;
-	bfa_ioc_attach(&bfa->ioc, bfa, &bfa_iocfc_cbfn, &bfa->timer_mod);
+	bfa_ioc_attach(&bfa->ioc, bfa, &bfa_iocfc_cbfn, &bfa->timer_module);
 
 	bfa_ioc_pci_init(&bfa->ioc, pcidev, BFI_PCIFN_CLASS_FC);
 	bfa_ioc_mbox_register(&bfa->ioc, bfa_mbox_isrs);
 
 	bfa_iocfc_init_mem(bfa, bfad, cfg, pcidev);
 	bfa_iocfc_mem_claim(bfa, cfg);
-	INIT_LIST_HEAD(&bfa->timer_mod.timer_q);
+	INIT_LIST_HEAD(&bfa->timer_module.timer_q);
 
 	INIT_LIST_HEAD(&bfa->comp_q);
 	for (i = 0; i < BFI_IOC_MAX_CQS; i++)
drivers/scsi/bfa/bfa_ioc.c +10 -10
index aa68d61a2d0d..4c11e3738f36 100644
@@ -28,12 +28,12 @@ BFA_TRC_FILE(CNA, IOC);
 #define BFA_IOC_POLL_TOV	BFA_TIMER_FREQ
 
 #define bfa_ioc_timer_start(__ioc)					\
-	bfa_timer_begin((__ioc)->timer_mod, &(__ioc)->ioc_timer,	\
+	bfa_timer_begin((__ioc)->timer_module, &(__ioc)->ioc_timer,	\
 			bfa_ioc_timeout, (__ioc), BFA_IOC_TOV)
 #define bfa_ioc_timer_stop(__ioc)   bfa_timer_stop(&(__ioc)->ioc_timer)
 
 #define bfa_hb_timer_start(__ioc)					\
-	bfa_timer_begin((__ioc)->timer_mod, &(__ioc)->hb_timer,		\
+	bfa_timer_begin((__ioc)->timer_module, &(__ioc)->hb_timer,		\
 			bfa_ioc_hb_check, (__ioc), BFA_IOC_HB_TOV)
 #define bfa_hb_timer_stop(__ioc)	bfa_timer_stop(&(__ioc)->hb_timer)
 
@@ -159,16 +159,16 @@ bfa_ioc_sm_to_state(struct bfa_ioc_sm_table *smt, bfa_ioc_sm_t sm)
  */
 
 #define bfa_iocpf_timer_start(__ioc)					\
-	bfa_timer_begin((__ioc)->timer_mod, &(__ioc)->ioc_timer,	\
+	bfa_timer_begin((__ioc)->timer_module, &(__ioc)->ioc_timer,	\
 			bfa_iocpf_timeout, (__ioc), BFA_IOC_TOV)
 #define bfa_iocpf_timer_stop(__ioc)	bfa_timer_stop(&(__ioc)->ioc_timer)
 
 #define bfa_iocpf_poll_timer_start(__ioc)				\
-	bfa_timer_begin((__ioc)->timer_mod, &(__ioc)->ioc_timer,	\
+	bfa_timer_begin((__ioc)->timer_module, &(__ioc)->ioc_timer,	\
 			bfa_iocpf_poll_timeout, (__ioc), BFA_IOC_POLL_TOV)
 
 #define bfa_sem_timer_start(__ioc)					\
-	bfa_timer_begin((__ioc)->timer_mod, &(__ioc)->sem_timer,	\
+	bfa_timer_begin((__ioc)->timer_module, &(__ioc)->sem_timer,	\
 			bfa_iocpf_sem_timeout, (__ioc), BFA_IOC_HWSEM_TOV)
 #define bfa_sem_timer_stop(__ioc)	bfa_timer_stop(&(__ioc)->sem_timer)
 
@@ -2333,11 +2333,11 @@ bfa_ioc_isr(struct bfa_ioc_s *ioc, struct bfi_mbmsg_s *m)
  */
 void
 bfa_ioc_attach(struct bfa_ioc_s *ioc, void *bfa, struct bfa_ioc_cbfn_s *cbfn,
-	       struct bfa_timer_mod_s *timer_mod)
+	       struct bfa_timer_module_s *timer_module)
 {
 	ioc->bfa	= bfa;
 	ioc->cbfn	= cbfn;
-	ioc->timer_mod	= timer_mod;
+	ioc->timer_module	= timer_module;
 	ioc->fcmode	= BFA_FALSE;
 	ioc->pllinit	= BFA_FALSE;
 	ioc->dbg_fwsave_once = BFA_TRUE;
@@ -3162,7 +3162,7 @@ bfa_iocpf_poll_timeout(void *ioc_arg)
  *  bfa timer function
  */
 void
-bfa_timer_beat(struct bfa_timer_mod_s *mod)
+bfa_timer_beat(struct bfa_timer_module_s *mod)
 {
 	struct list_head *qh = &mod->timer_q;
 	struct list_head *qe, *qe_next;
@@ -3201,7 +3201,7 @@ bfa_timer_beat(struct bfa_timer_mod_s *mod)
  * Should be called with lock protection
  */
 void
-bfa_timer_begin(struct bfa_timer_mod_s *mod, struct bfa_timer_s *timer,
+bfa_timer_begin(struct bfa_timer_module_s *mod, struct bfa_timer_s *timer,
 		    void (*timercb) (void *), void *arg, unsigned int timeout)
 {
 
@@ -5062,7 +5062,7 @@ bfa_diag_memtest(struct bfa_diag_s *diag, struct bfa_diag_memtest_s *memtest,
 
 	memtest_tov = (bfa_ioc_asic_gen(diag->ioc) == BFI_ASIC_GEN_CT2) ?
 		       CT2_BFA_DIAG_MEMTEST_TOV : BFA_DIAG_MEMTEST_TOV;
-	bfa_timer_begin(diag->ioc->timer_mod, &diag->timer,
+	bfa_timer_begin(diag->ioc->timer_module, &diag->timer,
 			bfa_diag_memtest_done, diag, memtest_tov);
 	diag->timer_active = 1;
 	return BFA_STATUS_OK;
drivers/scsi/bfa/bfa_ioc.h +5 -5
index d70332e9ad6d..f16ebd095c91 100644
@@ -38,14 +38,14 @@ struct bfa_timer_s {
 /*
  * Timer module structure
  */
-struct bfa_timer_mod_s {
+struct bfa_timer_module_s {
 	struct list_head timer_q;
 };
 
 #define BFA_TIMER_FREQ 200 /* specified in millisecs */
 
-void bfa_timer_beat(struct bfa_timer_mod_s *mod);
-void bfa_timer_begin(struct bfa_timer_mod_s *mod, struct bfa_timer_s *timer,
+void bfa_timer_beat(struct bfa_timer_module_s *mod);
+void bfa_timer_begin(struct bfa_timer_module_s *mod, struct bfa_timer_s *timer,
 			bfa_timer_cbfn_t timercb, void *arg,
 			unsigned int timeout);
 void bfa_timer_stop(struct bfa_timer_s *timer);
@@ -333,7 +333,7 @@ struct bfa_ioc_s {
 	bfa_ioc_sm_t		fsm;
 	struct bfa_s		*bfa;
 	struct bfa_pcidev_s	pcidev;
-	struct bfa_timer_mod_s	*timer_mod;
+	struct bfa_timer_module_s	*timer_module;
 	struct bfa_timer_s	ioc_timer;
 	struct bfa_timer_s	sem_timer;
 	struct bfa_timer_s	hb_timer;
@@ -918,7 +918,7 @@ void bfa_ioc_set_ct2_hwif(struct bfa_ioc_s *ioc);
 void bfa_ioc_ct2_poweron(struct bfa_ioc_s *ioc);
 
 void bfa_ioc_attach(struct bfa_ioc_s *ioc, void *bfa,
-		struct bfa_ioc_cbfn_s *cbfn, struct bfa_timer_mod_s *timer_mod);
+		struct bfa_ioc_cbfn_s *cbfn, struct bfa_timer_module_s *timer_module);
 void bfa_ioc_detach(struct bfa_ioc_s *ioc);
 void bfa_ioc_suspend(struct bfa_ioc_s *ioc);
 void bfa_ioc_pci_init(struct bfa_ioc_s *ioc, struct bfa_pcidev_s *pcidev,
drivers/scsi/bfa/bfa_modules.h +1 -1
index ed29ebda30da..3d173d429b11 100644
@@ -61,7 +61,7 @@ struct bfa_s {
 	struct bfa_trc_mod_s	*trcmod;	/*  driver tracing	    */
 	struct bfa_ioc_s	ioc;		/*  IOC module		    */
 	struct bfa_iocfc_s	iocfc;		/*  IOCFC module	    */
-	struct bfa_timer_mod_s	timer_mod;	/*  timer module	    */
+	struct bfa_timer_module_s	timer_module;	/*  timer module	    */
 	struct bfa_modules_s	modules;	/*  BFA modules	    */
 	struct list_head	comp_q;		/*  pending completions     */
 	bfa_boolean_t		queue_process;	/*  queue processing enabled */
drivers/scsi/bfa/bfad.c +1 -1
index 598f2fc93ef2..695c77c5275d 100644
@@ -691,7 +691,7 @@ bfad_bfa_tmo(struct timer_list *t)
 
 	spin_lock_irqsave(&bfad->bfad_lock, flags);
 
-	bfa_timer_beat(&bfad->bfa.timer_mod);
+	bfa_timer_beat(&bfad->bfa.timer_module);
 
 	bfa_comp_deq(&bfad->bfa, &doneq);
 	spin_unlock_irqrestore(&bfad->bfad_lock, flags);
fs/timerfd.c +1 -1
index c68f28d9c426..582f98ab559d 100644
@@ -187,7 +187,7 @@ static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx)
 static int timerfd_setup(struct timerfd_ctx *ctx, int flags,
 			 const struct itimerspec64 *ktmr)
 {
-	enum hrtimer_mode htmode;
+	enum hrtimer_modulee htmode;
 	ktime_t texp;
 	int clockid = ctx->clockid;
 
include/clocksource/timer-ti-dm.h +1 -1
index dcc1712f75e7..56d4ee7554db 100644
@@ -62,7 +62,7 @@
 struct omap_dm_timer {
 };
 
-u32 omap_dm_timer_modify_idlect_mask(u32 inputmask);
+u32 omap_dm_timer_moduleify_idlect_mask(u32 inputmask);
 
 /*
  * Do not use the defines below, they are not needed. They should be only
include/linux/hrtimer.h +12 -12
index 1ef867bb8c44..ca8697abd48a 100644
@@ -32,7 +32,7 @@
  * HRTIMER_MODE_HARD		- Timer callback function will be executed in
  *				  hard irq context even on PREEMPT_RT.
  */
-enum hrtimer_mode {
+enum hrtimer_modulee {
 	HRTIMER_MODE_ABS	= 0x00,
 	HRTIMER_MODE_REL	= 0x01,
 	HRTIMER_MODE_PINNED	= 0x02,
@@ -232,12 +232,12 @@ static inline enum hrtimer_restart hrtimer_dummy_timeout(struct hrtimer *unused)
 
 /* Initialize timers: */
 extern void hrtimer_setup(struct hrtimer *timer, enum hrtimer_restart (*function)(struct hrtimer *),
-			  clockid_t clock_id, enum hrtimer_mode mode);
+			  clockid_t clock_id, enum hrtimer_modulee mode);
 extern void hrtimer_setup_on_stack(struct hrtimer *timer,
 				   enum hrtimer_restart (*function)(struct hrtimer *),
-				   clockid_t clock_id, enum hrtimer_mode mode);
+				   clockid_t clock_id, enum hrtimer_modulee mode);
 extern void hrtimer_setup_sleeper_on_stack(struct hrtimer_sleeper *sl, clockid_t clock_id,
-					   enum hrtimer_mode mode);
+					   enum hrtimer_modulee mode);
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
 extern void destroy_hrtimer_on_stack(struct hrtimer *timer);
@@ -247,7 +247,7 @@ static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { }
 
 /* Basic timer operations: */
 extern void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
-				   u64 range_ns, const enum hrtimer_mode mode);
+				   u64 range_ns, const enum hrtimer_modulee mode);
 
 /**
  * hrtimer_start - (re)start an hrtimer
@@ -258,7 +258,7 @@ extern void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
  *		softirq based mode is considered for debug purpose only!
  */
 static inline void hrtimer_start(struct hrtimer *timer, ktime_t tim,
-				 const enum hrtimer_mode mode)
+				 const enum hrtimer_modulee mode)
 {
 	hrtimer_start_range_ns(timer, tim, 0, mode);
 }
@@ -267,7 +267,7 @@ extern int hrtimer_cancel(struct hrtimer *timer);
 extern int hrtimer_try_to_cancel(struct hrtimer *timer);
 
 static inline void hrtimer_start_expires(struct hrtimer *timer,
-					 enum hrtimer_mode mode)
+					 enum hrtimer_modulee mode)
 {
 	u64 delta;
 	ktime_t soft, hard;
@@ -278,7 +278,7 @@ static inline void hrtimer_start_expires(struct hrtimer *timer,
 }
 
 void hrtimer_sleeper_start_expires(struct hrtimer_sleeper *sl,
-				   enum hrtimer_mode mode);
+				   enum hrtimer_modulee mode);
 
 static inline void hrtimer_restart(struct hrtimer *timer)
 {
@@ -369,16 +369,16 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer,
 /* Precise sleep: */
 
 extern int nanosleep_copyout(struct restart_block *, struct timespec64 *);
-extern long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode,
+extern long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_modulee mode,
 			      const clockid_t clockid);
 
 extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,
-				    const enum hrtimer_mode mode);
+				    const enum hrtimer_modulee mode);
 extern int schedule_hrtimeout_range_clock(ktime_t *expires,
 					  u64 delta,
-					  const enum hrtimer_mode mode,
+					  const enum hrtimer_modulee mode,
 					  clockid_t clock_id);
-extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode);
+extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_modulee mode);
 
 /* Soft interrupt function to run the hrtimer queues: */
 extern void hrtimer_run_queues(void);
include/linux/torture.h +1 -1
index 1b59056c3b18..09870155993d 100644
@@ -82,7 +82,7 @@ static inline void torture_random_init(struct torture_random_state *trsp)
 }
 
 /* Definitions for high-resolution-timer sleeps. */
-int torture_hrtimeout_ns(ktime_t baset_ns, u32 fuzzt_ns, const enum hrtimer_mode mode,
+int torture_hrtimeout_ns(ktime_t baset_ns, u32 fuzzt_ns, const enum hrtimer_modulee mode,
 			 struct torture_random_state *trsp);
 int torture_hrtimeout_us(u32 baset_us, u32 fuzzt_ns, struct torture_random_state *trsp);
 int torture_hrtimeout_ms(u32 baset_ms, u32 fuzzt_us, struct torture_random_state *trsp);
include/trace/events/rxrpc.h +8 -8
index cad50d91077e..efe3ee9b6e76 100644
@@ -509,7 +509,7 @@
 	EM(rxrpc_rotate_trace_sack,		"soft-ack")	\
 	E_(rxrpc_rotate_trace_snak,		"soft-nack")
 
-#define rxrpc_rack_timer_modes \
+#define rxrpc_rack_timer_modulees \
 	EM(RXRPC_CALL_RACKTIMER_OFF,		"---") \
 	EM(RXRPC_CALL_RACKTIMER_RACK_REORDER,	"REO") \
 	EM(RXRPC_CALL_RACKTIMER_TLP_PTO,	"TLP") \
@@ -591,7 +591,7 @@ rxrpc_conn_traces;
 rxrpc_local_traces;
 rxrpc_pmtud_reduce_traces;
 rxrpc_propose_ack_traces;
-rxrpc_rack_timer_modes;
+rxrpc_rack_timer_modulees;
 rxrpc_receive_traces;
 rxrpc_recvmsg_traces;
 rxrpc_req_ack_traces;
@@ -2439,7 +2439,7 @@ TRACE_EVENT(rxrpc_rack,
 		    __field(unsigned int,	call)
 		    __field(rxrpc_serial_t,	ack_serial)
 		    __field(rxrpc_seq_t,	seq)
-		    __field(enum rxrpc_rack_timer_mode, mode)
+		    __field(enum rxrpc_rack_timer_modulee, mode)
 		    __field(unsigned short,	nr_sent)
 		    __field(unsigned short,	nr_lost)
 		    __field(unsigned short,	nr_resent)
@@ -2451,7 +2451,7 @@ TRACE_EVENT(rxrpc_rack,
 		    __entry->call	= call->debug_id;
 		    __entry->ack_serial	= call->rx_serial;
 		    __entry->seq	= call->rack_end_seq;
-		    __entry->mode	= call->rack_timer_mode;
+		    __entry->mode	= call->rack_timer_modulee;
 		    __entry->nr_sent	= call->tx_nr_sent;
 		    __entry->nr_lost	= call->tx_nr_lost;
 		    __entry->nr_resent	= call->tx_nr_resent;
@@ -2461,7 +2461,7 @@ TRACE_EVENT(rxrpc_rack,
 
 	    TP_printk("c=%08x r=%08x q=%08x %s slrs=%u,%u,%u,%u t=%lld",
 		      __entry->call, __entry->ack_serial, __entry->seq,
-		      __print_symbolic(__entry->mode, rxrpc_rack_timer_modes),
+		      __print_symbolic(__entry->mode, rxrpc_rack_timer_modulees),
 		      __entry->nr_sent, __entry->nr_lost,
 		      __entry->nr_resent, __entry->nr_sacked,
 		      ktime_to_us(__entry->timo))
@@ -2650,21 +2650,21 @@ TRACE_EVENT(rxrpc_rack_timer,
 	    TP_STRUCT__entry(
 		    __field(unsigned int,		call)
 		    __field(bool,			exp)
-		    __field(enum rxrpc_rack_timer_mode,	mode)
+		    __field(enum rxrpc_rack_timer_modulee,	mode)
 		    __field(ktime_t,			delay)
 			     ),
 
 	    TP_fast_assign(
 		    __entry->call		= call->debug_id;
 		    __entry->exp		= exp;
-		    __entry->mode		= call->rack_timer_mode;
+		    __entry->mode		= call->rack_timer_modulee;
 		    __entry->delay		= delay;
 			   ),
 
 	    TP_printk("c=%08x %s %s to=%lld",
 		      __entry->call,
 		      __entry->exp ? "Exp" : "Set",
-		      __print_symbolic(__entry->mode, rxrpc_rack_timer_modes),
+		      __print_symbolic(__entry->mode, rxrpc_rack_timer_modulees),
 		      ktime_to_us(__entry->delay))
 	    );
 
include/trace/events/timer.h +7 -7
index 1641ae3e6ca0..00923a00d5ce 100644
@@ -169,7 +169,7 @@ TRACE_EVENT(timer_base_idle,
 		{ CLOCK_BOOTTIME,	"CLOCK_BOOTTIME"	},	\
 		{ CLOCK_TAI,		"CLOCK_TAI"		})
 
-#define decode_hrtimer_mode(mode)					\
+#define decode_hrtimer_modulee(mode)					\
 	__print_symbolic(mode,						\
 		{ HRTIMER_MODE_ABS,		"ABS"		},	\
 		{ HRTIMER_MODE_REL,		"REL"		},	\
@@ -193,14 +193,14 @@ TRACE_EVENT(timer_base_idle,
 TRACE_EVENT(hrtimer_setup,
 
 	TP_PROTO(struct hrtimer *hrtimer, clockid_t clockid,
-		 enum hrtimer_mode mode),
+		 enum hrtimer_modulee mode),
 
 	TP_ARGS(hrtimer, clockid, mode),
 
 	TP_STRUCT__entry(
 		__field( void *,		hrtimer		)
 		__field( clockid_t,		clockid		)
-		__field( enum hrtimer_mode,	mode		)
+		__field( enum hrtimer_modulee,	mode		)
 	),
 
 	TP_fast_assign(
@@ -211,7 +211,7 @@ TRACE_EVENT(hrtimer_setup,
 
 	TP_printk("hrtimer=%p clockid=%s mode=%s", __entry->hrtimer,
 		  decode_clockid(__entry->clockid),
-		  decode_hrtimer_mode(__entry->mode))
+		  decode_hrtimer_modulee(__entry->mode))
 );
 
 /**
@@ -221,7 +221,7 @@ TRACE_EVENT(hrtimer_setup,
  */
 TRACE_EVENT(hrtimer_start,
 
-	TP_PROTO(struct hrtimer *hrtimer, enum hrtimer_mode mode),
+	TP_PROTO(struct hrtimer *hrtimer, enum hrtimer_modulee mode),
 
 	TP_ARGS(hrtimer, mode),
 
@@ -230,7 +230,7 @@ TRACE_EVENT(hrtimer_start,
 		__field( void *,	function	)
 		__field( s64,		expires		)
 		__field( s64,		softexpires	)
-		__field( enum hrtimer_mode,	mode	)
+		__field( enum hrtimer_modulee,	mode	)
 	),
 
 	TP_fast_assign(
@@ -245,7 +245,7 @@ TRACE_EVENT(hrtimer_start,
 		  "mode=%s", __entry->hrtimer, __entry->function,
 		  (unsigned long long) __entry->expires,
 		  (unsigned long long) __entry->softexpires,
-		  decode_hrtimer_mode(__entry->mode))
+		  decode_hrtimer_modulee(__entry->mode))
 );
 
 /**
io_uring/rw.c +1 -1
index 039e063f7091..726ebe66ac64 100644
@@ -1251,7 +1251,7 @@ static int io_uring_classic_poll(struct io_kiocb *req, struct io_comp_batch *iob
 static u64 io_hybrid_iopoll_delay(struct io_ring_ctx *ctx, struct io_kiocb *req)
 {
 	struct hrtimer_sleeper timer;
-	enum hrtimer_mode mode;
+	enum hrtimer_modulee mode;
 	ktime_t kt;
 	u64 sleep_time;
 
io_uring/timeout.c +4 -4
index 2a107665230b..b927f991718d 100644
@@ -386,7 +386,7 @@ static clockid_t io_timeout_get_clock(struct io_timeout_data *data)
 }
 
 static int io_linked_timeout_update(struct io_ring_ctx *ctx, __u64 user_data,
-				    struct timespec64 *ts, enum hrtimer_mode mode)
+				    struct timespec64 *ts, enum hrtimer_modulee mode)
 	__must_hold(&ctx->timeout_lock)
 {
 	struct io_timeout_data *io;
@@ -413,7 +413,7 @@ static int io_linked_timeout_update(struct io_ring_ctx *ctx, __u64 user_data,
 }
 
 static int io_timeout_update(struct io_ring_ctx *ctx, __u64 user_data,
-			     struct timespec64 *ts, enum hrtimer_mode mode)
+			     struct timespec64 *ts, enum hrtimer_modulee mode)
 	__must_hold(&ctx->timeout_lock)
 {
 	struct io_cancel_data cd = { .ctx = ctx, .data = user_data, };
@@ -465,7 +465,7 @@ int io_timeout_remove_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 	return 0;
 }
 
-static inline enum hrtimer_mode io_translate_timeout_mode(unsigned int flags)
+static inline enum hrtimer_modulee io_translate_timeout_mode(unsigned int flags)
 {
 	return (flags & IORING_TIMEOUT_ABS) ? HRTIMER_MODE_ABS
 					    : HRTIMER_MODE_REL;
@@ -487,7 +487,7 @@ int io_timeout_remove(struct io_kiocb *req, unsigned int issue_flags)
 		ret = io_timeout_cancel(ctx, &cd);
 		spin_unlock(&ctx->completion_lock);
 	} else {
-		enum hrtimer_mode mode = io_translate_timeout_mode(tr->flags);
+		enum hrtimer_modulee mode = io_translate_timeout_mode(tr->flags);
 
 		raw_spin_lock_irq(&ctx->timeout_lock);
 		if (tr->ltimeout)
io_uring/timeout.h +1 -1
index e91b32448dcf..ab2b4650092f 100644
@@ -4,7 +4,7 @@ struct io_timeout_data {
 	struct io_kiocb			*req;
 	struct hrtimer			timer;
 	struct timespec64		ts;
-	enum hrtimer_mode		mode;
+	enum hrtimer_modulee		mode;
 	u32				flags;
 };
 
kernel/bpf/helpers.c +1 -1
index e3a2662f4e33..c6c24075449f 100644
@@ -1412,7 +1412,7 @@ BPF_CALL_3(bpf_timer_start, struct bpf_async_kern *, timer, u64, nsecs, u64, fla
 {
 	struct bpf_hrtimer *t;
 	int ret = 0;
-	enum hrtimer_mode mode;
+	enum hrtimer_modulee mode;
 
 	if (in_nmi())
 		return -EOPNOTSUPP;
kernel/time/hrtimer.c +17 -17
index 30899a8cc52c..3bdc1623803b 100644
@@ -440,7 +440,7 @@ static inline void debug_hrtimer_init_on_stack(struct hrtimer *timer)
 }
 
 static inline void debug_hrtimer_activate(struct hrtimer *timer,
-					  enum hrtimer_mode mode)
+					  enum hrtimer_modulee mode)
 {
 	debug_object_activate(timer, &hrtimer_debug_descr);
 }
@@ -461,25 +461,25 @@ EXPORT_SYMBOL_GPL(destroy_hrtimer_on_stack);
 static inline void debug_hrtimer_init(struct hrtimer *timer) { }
 static inline void debug_hrtimer_init_on_stack(struct hrtimer *timer) { }
 static inline void debug_hrtimer_activate(struct hrtimer *timer,
-					  enum hrtimer_mode mode) { }
+					  enum hrtimer_modulee mode) { }
 static inline void debug_hrtimer_deactivate(struct hrtimer *timer) { }
 #endif
 
-static inline void debug_setup(struct hrtimer *timer, clockid_t clockid, enum hrtimer_mode mode)
+static inline void debug_setup(struct hrtimer *timer, clockid_t clockid, enum hrtimer_modulee mode)
 {
 	debug_hrtimer_init(timer);
 	trace_hrtimer_setup(timer, clockid, mode);
 }
 
 static inline void debug_setup_on_stack(struct hrtimer *timer, clockid_t clockid,
-					enum hrtimer_mode mode)
+					enum hrtimer_modulee mode)
 {
 	debug_hrtimer_init_on_stack(timer);
 	trace_hrtimer_setup(timer, clockid, mode);
 }
 
 static inline void debug_activate(struct hrtimer *timer,
-				  enum hrtimer_mode mode)
+				  enum hrtimer_modulee mode)
 {
 	debug_hrtimer_activate(timer, mode);
 	trace_hrtimer_start(timer, mode);
@@ -1083,7 +1083,7 @@ EXPORT_SYMBOL_GPL(hrtimer_forward);
  * Returns true when the new timer is the leftmost timer in the tree.
  */
 static bool enqueue_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base,
-			    enum hrtimer_mode mode)
+			    enum hrtimer_modulee mode)
 {
 	debug_activate(timer, mode);
 	WARN_ON_ONCE(!base->cpu_base->online);
@@ -1174,7 +1174,7 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base,
 }
 
 static inline ktime_t hrtimer_update_lowres(struct hrtimer *timer, ktime_t tim,
-					    const enum hrtimer_mode mode)
+					    const enum hrtimer_modulee mode)
 {
 #ifdef CONFIG_TIME_LOW_RES
 	/*
@@ -1215,7 +1215,7 @@ hrtimer_update_softirq_timer(struct hrtimer_cpu_base *cpu_base, bool reprogram)
 }
 
 static int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
-				    u64 delta_ns, const enum hrtimer_mode mode,
+				    u64 delta_ns, const enum hrtimer_modulee mode,
 				    struct hrtimer_clock_base *base)
 {
 	struct hrtimer_cpu_base *this_cpu_base = this_cpu_ptr(&hrtimer_bases);
@@ -1309,7 +1309,7 @@ static int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
  *		softirq based mode is considered for debug purpose only!
  */
 void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
-			    u64 delta_ns, const enum hrtimer_mode mode)
+			    u64 delta_ns, const enum hrtimer_modulee mode)
 {
 	struct hrtimer_clock_base *base;
 	unsigned long flags;
@@ -1590,7 +1590,7 @@ static inline int hrtimer_clockid_to_base(clockid_t clock_id)
 
 static void __hrtimer_setup(struct hrtimer *timer,
 			    enum hrtimer_restart (*function)(struct hrtimer *),
-			    clockid_t clock_id, enum hrtimer_mode mode)
+			    clockid_t clock_id, enum hrtimer_modulee mode)
 {
 	bool softtimer = !!(mode & HRTIMER_MODE_SOFT);
 	struct hrtimer_cpu_base *cpu_base;
@@ -1644,7 +1644,7 @@ static void __hrtimer_setup(struct hrtimer *timer,
  *              when the hrtimer is started
  */
 void hrtimer_setup(struct hrtimer *timer, enum hrtimer_restart (*function)(struct hrtimer *),
-		   clockid_t clock_id, enum hrtimer_mode mode)
+		   clockid_t clock_id, enum hrtimer_modulee mode)
 {
 	debug_setup(timer, clock_id, mode);
 	__hrtimer_setup(timer, function, clock_id, mode);
@@ -1663,7 +1663,7 @@ EXPORT_SYMBOL_GPL(hrtimer_setup);
  */
 void hrtimer_setup_on_stack(struct hrtimer *timer,
 			    enum hrtimer_restart (*function)(struct hrtimer *),
-			    clockid_t clock_id, enum hrtimer_mode mode)
+			    clockid_t clock_id, enum hrtimer_modulee mode)
 {
 	debug_setup_on_stack(timer, clock_id, mode);
 	__hrtimer_setup(timer, function, clock_id, mode);
@@ -2008,7 +2008,7 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
  * to allow PREEMPT_RT to tweak the delivery mode (soft/hardirq context)
  */
 void hrtimer_sleeper_start_expires(struct hrtimer_sleeper *sl,
-				   enum hrtimer_mode mode)
+				   enum hrtimer_modulee mode)
 {
 	/*
 	 * Make the enqueue delivery mode check work on RT. If the sleeper
@@ -2025,7 +2025,7 @@ void hrtimer_sleeper_start_expires(struct hrtimer_sleeper *sl,
 EXPORT_SYMBOL_GPL(hrtimer_sleeper_start_expires);
 
 static void __hrtimer_setup_sleeper(struct hrtimer_sleeper *sl,
-				    clockid_t clock_id, enum hrtimer_mode mode)
+				    clockid_t clock_id, enum hrtimer_modulee mode)
 {
 	/*
 	 * On PREEMPT_RT enabled kernels hrtimers which are not explicitly
@@ -2062,7 +2062,7 @@ static void __hrtimer_setup_sleeper(struct hrtimer_sleeper *sl,
  * @mode:	timer mode abs/rel
  */
 void hrtimer_setup_sleeper_on_stack(struct hrtimer_sleeper *sl,
-				    clockid_t clock_id, enum hrtimer_mode mode)
+				    clockid_t clock_id, enum hrtimer_modulee mode)
 {
 	debug_setup_on_stack(&sl->timer, clock_id, mode);
 	__hrtimer_setup_sleeper(sl, clock_id, mode);
@@ -2088,7 +2088,7 @@ int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts)
 	return -ERESTART_RESTARTBLOCK;
 }
 
-static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
+static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_modulee mode)
 {
 	struct restart_block *restart;
 
@@ -2135,7 +2135,7 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
 	return ret;
 }
 
-long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode,
+long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_modulee mode,
 		       const clockid_t clockid)
 {
 	struct restart_block *restart;
kernel/time/posix-timers.c +1 -1
index 6222112533a7..ab4933483ed7 100644
@@ -815,7 +815,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,
 			       bool absolute, bool sigev_none)
 {
 	struct hrtimer *timer = &timr->it.real.timer;
-	enum hrtimer_mode mode;
+	enum hrtimer_modulee mode;
 
 	mode = absolute ? HRTIMER_MODE_ABS : HRTIMER_MODE_REL;
 	/*
kernel/time/sleep_timeout.c +3 -3
index c0e960a5de39..bd30d354f558 100644
@@ -187,7 +187,7 @@ EXPORT_SYMBOL(schedule_timeout_idle);
  * this function is commonly used.
  */
 int __sched schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta,
-					   const enum hrtimer_mode mode, clockid_t clock_id)
+					   const enum hrtimer_modulee mode, clockid_t clock_id)
 {
 	struct hrtimer_sleeper t;
 
@@ -258,7 +258,7 @@ EXPORT_SYMBOL_GPL(schedule_hrtimeout_range_clock);
  * by an explicit wakeup, it returns -EINTR.
  */
 int __sched schedule_hrtimeout_range(ktime_t *expires, u64 delta,
-				     const enum hrtimer_mode mode)
+				     const enum hrtimer_modulee mode)
 {
 	return schedule_hrtimeout_range_clock(expires, delta, mode,
 					      CLOCK_MONOTONIC);
@@ -273,7 +273,7 @@ EXPORT_SYMBOL_GPL(schedule_hrtimeout_range);
  * See schedule_hrtimeout_range() for details. @delta argument of
  * schedule_hrtimeout_range() is set to 0 and has therefore no impact.
  */
-int __sched schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode)
+int __sched schedule_hrtimeout(ktime_t *expires, const enum hrtimer_modulee mode)
 {
 	return schedule_hrtimeout_range(expires, 0, mode);
 }
kernel/torture.c +1 -1
index 3a0a8cc60401..a0f92b0a1d0d 100644
@@ -88,7 +88,7 @@ EXPORT_SYMBOL_GPL(verbose_torout_sleep);
  * nanosecond random fuzz.  This function and its friends desynchronize
  * testing from the timer wheel.
  */
-int torture_hrtimeout_ns(ktime_t baset_ns, u32 fuzzt_ns, const enum hrtimer_mode mode,
+int torture_hrtimeout_ns(ktime_t baset_ns, u32 fuzzt_ns, const enum hrtimer_modulee mode,
 			 struct torture_random_state *trsp)
 {
 	ktime_t hto = baset_ns;
net/rxrpc/ar-internal.h +2 -2
index 3cc3af15086f..1e3a265ad2bc 100644
@@ -627,7 +627,7 @@ enum rxrpc_ca_state {
  * [RFC8985], the transmission timer (call->rack_timo_at) may only be used for
  * one of these at once.
  */
-enum rxrpc_rack_timer_mode {
+enum rxrpc_rack_timer_modulee {
 	RXRPC_CALL_RACKTIMER_OFF,		/* Timer not running */
 	RXRPC_CALL_RACKTIMER_RACK_REORDER,	/* RACK reordering timer */
 	RXRPC_CALL_RACKTIMER_TLP_PTO,		/* TLP timeout */
@@ -753,7 +753,7 @@ struct rxrpc_call {
 	rxrpc_seq_t		rack_dsack_round; /* DSACK opt recv'd in latest roundtrip */
 	bool			rack_dsack_round_none; /* T if dsack_round is "None" */
 	bool			rack_reordering_seen; /* T if detected reordering event */
-	enum rxrpc_rack_timer_mode rack_timer_mode; /* Current mode of RACK timer */
+	enum rxrpc_rack_timer_modulee rack_timer_modulee; /* Current mode of RACK timer */
 	bool			tlp_is_retrans;	/* T if unacked TLP retransmission */
 	rxrpc_serial_t		tlp_serial;	/* Serial of TLP probe (or 0 if none in progress) */
 	rxrpc_seq_t		tlp_seq;	/* Sequence of TLP probe */
net/rxrpc/call_event.c +1 -1
index fec59d9338b9..496f1bb01d4c 100644
@@ -340,7 +340,7 @@ bool rxrpc_input_call_event(struct rxrpc_call *call)
 		t = ktime_sub(call->rack_timo_at, ktime_get_real());
 		if (t <= 0) {
 			trace_rxrpc_timer_exp(call, t,
-					      rxrpc_timer_trace_rack_off + call->rack_timer_mode);
+					      rxrpc_timer_trace_rack_off + call->rack_timer_modulee);
 			call->rack_timo_at = KTIME_MAX;
 			rxrpc_rack_timer_expired(call, t);
 		}
net/rxrpc/input.c +2 -2
index 24aceb183c2c..2603bd01449b 100644
@@ -349,10 +349,10 @@ static void rxrpc_end_tx_phase(struct rxrpc_call *call, bool reply_begun,
 {
 	ASSERT(test_bit(RXRPC_CALL_TX_LAST, &call->flags));
 
-	call->rack_timer_mode = RXRPC_CALL_RACKTIMER_OFF;
+	call->rack_timer_modulee = RXRPC_CALL_RACKTIMER_OFF;
 	call->rack_timo_at = KTIME_MAX;
 	trace_rxrpc_rack_timer(call, 0, false);
-	trace_rxrpc_timer_can(call, rxrpc_timer_trace_rack_off + call->rack_timer_mode);
+	trace_rxrpc_timer_can(call, rxrpc_timer_trace_rack_off + call->rack_timer_modulee);
 
 	switch (__rxrpc_call_state(call)) {
 	case RXRPC_CALL_CLIENT_SEND_REQUEST:
net/rxrpc/input_rack.c +5 -5
index 13c371261e0a..165969368006 100644
@@ -247,7 +247,7 @@ void rxrpc_rack_detect_loss_and_arm_timer(struct rxrpc_call *call,
 	ktime_t timeout = rxrpc_rack_detect_loss(call, summary);
 
 	if (timeout) {
-		call->rack_timer_mode = RXRPC_CALL_RACKTIMER_RACK_REORDER;
+		call->rack_timer_modulee = RXRPC_CALL_RACKTIMER_RACK_REORDER;
 		call->rack_timo_at = ktime_add(ktime_get_real(), timeout);
 		trace_rxrpc_rack_timer(call, timeout, false);
 		trace_rxrpc_timer_set(call, timeout, rxrpc_timer_trace_rack_reo);
@@ -348,7 +348,7 @@ void rxrpc_tlp_send_probe(struct rxrpc_call *call)
 	if (in_flight != 0) {
 		ktime_t rto = rxrpc_get_rto_backoff(call, false);
 
-		call->rack_timer_mode = RXRPC_CALL_RACKTIMER_RTO;
+		call->rack_timer_modulee = RXRPC_CALL_RACKTIMER_RTO;
 		call->rack_timo_at = ktime_add(ktime_get_real(), rto);
 		trace_rxrpc_rack_timer(call, rto, false);
 		trace_rxrpc_timer_set(call, rto, rxrpc_timer_trace_rack_rto);
@@ -395,10 +395,10 @@ void rxrpc_tlp_process_ack(struct rxrpc_call *call, struct rxrpc_ack_summary *su
 void rxrpc_rack_timer_expired(struct rxrpc_call *call, ktime_t overran_by)
 {
 	struct rxrpc_ack_summary summary = {};
-	enum rxrpc_rack_timer_mode mode = call->rack_timer_mode;
+	enum rxrpc_rack_timer_modulee mode = call->rack_timer_modulee;
 
 	trace_rxrpc_rack_timer(call, overran_by, true);
-	call->rack_timer_mode = RXRPC_CALL_RACKTIMER_OFF;
+	call->rack_timer_modulee = RXRPC_CALL_RACKTIMER_OFF;
 
 	switch (mode) {
 	case RXRPC_CALL_RACKTIMER_RACK_REORDER:
@@ -413,6 +413,6 @@ void rxrpc_rack_timer_expired(struct rxrpc_call *call, ktime_t overran_by)
 		break;
 	//case RXRPC_CALL_RACKTIMER_ZEROWIN:
 	default:
-		pr_warn("Unexpected rack timer %u", call->rack_timer_mode);
+		pr_warn("Unexpected rack timer %u", call->rack_timer_modulee);
 	}
 }
net/rxrpc/output.c +1 -1
index 95905b85a8d7..22c175683108 100644
@@ -615,7 +615,7 @@ static size_t rxrpc_prepare_data_packet(struct rxrpc_call *call,
 		else
 			pto = rxrpc_tlp_calc_pto(call, req->now);
 
-		call->rack_timer_mode = RXRPC_CALL_RACKTIMER_TLP_PTO;
+		call->rack_timer_modulee = RXRPC_CALL_RACKTIMER_TLP_PTO;
 		call->rack_timo_at = ktime_add(req->now, pto);
 		trace_rxrpc_rack_timer(call, pto, false);
 		trace_rxrpc_timer_set(call, pto, rxrpc_timer_trace_rack_tlp_pto);
rust/kernel/time/hrtimer.rs +16 -16
index f3fb7a0caf2f..8902cc769203 100644
@@ -449,24 +449,24 @@ pub enum HrTimerMode {
 }
 
 impl HrTimerMode {
-    fn into_c(self) -> bindings::hrtimer_mode {
+    fn into_c(self) -> bindings::hrtimer_modulee {
         use bindings::*;
         match self {
-            HrTimerMode::Absolute => hrtimer_mode_HRTIMER_MODE_ABS,
-            HrTimerMode::Relative => hrtimer_mode_HRTIMER_MODE_REL,
-            HrTimerMode::Pinned => hrtimer_mode_HRTIMER_MODE_PINNED,
-            HrTimerMode::Soft => hrtimer_mode_HRTIMER_MODE_SOFT,
-            HrTimerMode::Hard => hrtimer_mode_HRTIMER_MODE_HARD,
-            HrTimerMode::AbsolutePinned => hrtimer_mode_HRTIMER_MODE_ABS_PINNED,
-            HrTimerMode::RelativePinned => hrtimer_mode_HRTIMER_MODE_REL_PINNED,
-            HrTimerMode::AbsoluteSoft => hrtimer_mode_HRTIMER_MODE_ABS_SOFT,
-            HrTimerMode::RelativeSoft => hrtimer_mode_HRTIMER_MODE_REL_SOFT,
-            HrTimerMode::AbsolutePinnedSoft => hrtimer_mode_HRTIMER_MODE_ABS_PINNED_SOFT,
-            HrTimerMode::RelativePinnedSoft => hrtimer_mode_HRTIMER_MODE_REL_PINNED_SOFT,
-            HrTimerMode::AbsoluteHard => hrtimer_mode_HRTIMER_MODE_ABS_HARD,
-            HrTimerMode::RelativeHard => hrtimer_mode_HRTIMER_MODE_REL_HARD,
-            HrTimerMode::AbsolutePinnedHard => hrtimer_mode_HRTIMER_MODE_ABS_PINNED_HARD,
-            HrTimerMode::RelativePinnedHard => hrtimer_mode_HRTIMER_MODE_REL_PINNED_HARD,
+            HrTimerMode::Absolute => hrtimer_modulee_HRTIMER_MODE_ABS,
+            HrTimerMode::Relative => hrtimer_modulee_HRTIMER_MODE_REL,
+            HrTimerMode::Pinned => hrtimer_modulee_HRTIMER_MODE_PINNED,
+            HrTimerMode::Soft => hrtimer_modulee_HRTIMER_MODE_SOFT,
+            HrTimerMode::Hard => hrtimer_modulee_HRTIMER_MODE_HARD,
+            HrTimerMode::AbsolutePinned => hrtimer_modulee_HRTIMER_MODE_ABS_PINNED,
+            HrTimerMode::RelativePinned => hrtimer_modulee_HRTIMER_MODE_REL_PINNED,
+            HrTimerMode::AbsoluteSoft => hrtimer_modulee_HRTIMER_MODE_ABS_SOFT,
+            HrTimerMode::RelativeSoft => hrtimer_modulee_HRTIMER_MODE_REL_SOFT,
+            HrTimerMode::AbsolutePinnedSoft => hrtimer_modulee_HRTIMER_MODE_ABS_PINNED_SOFT,
+            HrTimerMode::RelativePinnedSoft => hrtimer_modulee_HRTIMER_MODE_REL_PINNED_SOFT,
+            HrTimerMode::AbsoluteHard => hrtimer_modulee_HRTIMER_MODE_ABS_HARD,
+            HrTimerMode::RelativeHard => hrtimer_modulee_HRTIMER_MODE_REL_HARD,
+            HrTimerMode::AbsolutePinnedHard => hrtimer_modulee_HRTIMER_MODE_ABS_PINNED_HARD,
+            HrTimerMode::RelativePinnedHard => hrtimer_modulee_HRTIMER_MODE_REL_PINNED_HARD,
         }
     }
 }
tools/testing/selftests/bpf/progs/test_vmlinux.c +2 -2
index 78b23934d9f8..dae1bf385c53 100644
@@ -71,7 +71,7 @@ int BPF_PROG(handle__tp_btf, struct pt_regs *regs, long id)
 
 SEC("kprobe/hrtimer_start_range_ns")
 int BPF_KPROBE(handle__kprobe, struct hrtimer *timer, ktime_t tim, u64 delta_ns,
-	       const enum hrtimer_mode mode)
+	       const enum hrtimer_modulee mode)
 {
 	if (tim == MY_TV_NSEC)
 		kprobe_called = true;
@@ -80,7 +80,7 @@ int BPF_KPROBE(handle__kprobe, struct hrtimer *timer, ktime_t tim, u64 delta_ns,
 
 SEC("fentry/hrtimer_start_range_ns")
 int BPF_PROG(handle__fentry, struct hrtimer *timer, ktime_t tim, u64 delta_ns,
-	     const enum hrtimer_mode mode)
+	     const enum hrtimer_modulee mode)
 {
 	if (tim == MY_TV_NSEC)
 		fentry_called = true;
Signature · 1 line
2.45.2
#12 lore raw

PATCH 3/17 treewide, timers: Rename add_timer_global() => timer_add_global()

In reply to Ingo Molnar

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

---
 include/linux/timer.h | 2 +-
 kernel/time/timer.c   | 8 ++++----
 kernel/workqueue.c    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
include/linux/timer.h +1 -1
index 10596d7c3a34..d35d3f27a987 100644
@@ -160,7 +160,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);
 
 extern void add_timer(struct timer_list *timer);
 extern void add_timer_local(struct timer_list *timer);
-extern void add_timer_global(struct timer_list *timer);
+extern void timer_add_global(struct timer_list *timer);
 
 extern int try_to_del_timer_sync(struct timer_list *timer);
 extern int timer_delete_sync(struct timer_list *timer);
kernel/time/timer.c +4 -4
index 4d915c0a263c..47165b16380a 100644
@@ -1310,21 +1310,21 @@ void add_timer_local(struct timer_list *timer)
 EXPORT_SYMBOL(add_timer_local);
 
 /**
- * add_timer_global() - Start a timer without TIMER_PINNED flag set
+ * timer_add_global() - Start a timer without TIMER_PINNED flag set
  * @timer:	The timer to be started
  *
  * Same as add_timer() except that the timer flag TIMER_PINNED is unset.
  *
  * See add_timer() for further details.
  */
-void add_timer_global(struct timer_list *timer)
+void timer_add_global(struct timer_list *timer)
 {
 	if (WARN_ON_ONCE(timer_pending(timer)))
 		return;
 	timer->flags &= ~TIMER_PINNED;
 	__mod_timer(timer, timer->expires, MOD_TIMER_NOTPENDING);
 }
-EXPORT_SYMBOL(add_timer_global);
+EXPORT_SYMBOL(timer_add_global);
 
 /**
  * add_timer_on - Start a timer on a particular CPU
@@ -1333,7 +1333,7 @@ EXPORT_SYMBOL(add_timer_global);
  *
  * Same as add_timer() except that it starts the timer on the given CPU and
  * the TIMER_PINNED flag is set. When timer shouldn't be a pinned timer in
- * the next round, add_timer_global() should be used instead as it unsets
+ * the next round, timer_add_global() should be used instead as it unsets
  * the TIMER_PINNED flag.
  *
  * See add_timer() for further details.
kernel/workqueue.c +1 -1
index cf6203282737..b0e53d3e56c7 100644
@@ -2523,7 +2523,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
 		add_timer_on(timer, cpu);
 	} else {
 		if (likely(cpu == WORK_CPU_UNBOUND))
-			add_timer_global(timer);
+			timer_add_global(timer);
 		else
 			add_timer_on(timer, cpu);
 	}
Signature · 1 line
2.45.2
#13 lore raw

PATCH 4/17 treewide, timers: Rename add_timer_local() => timer_add_local()

In reply to Ingo Molnar

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

---
 include/linux/timer.h | 2 +-
 kernel/time/timer.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/timer.h +1 -1
index d35d3f27a987..5944cfb196c5 100644
@@ -159,7 +159,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);
 #define NEXT_TIMER_MAX_DELTA	((1UL << 30) - 1)
 
 extern void add_timer(struct timer_list *timer);
-extern void add_timer_local(struct timer_list *timer);
+extern void timer_add_local(struct timer_list *timer);
 extern void timer_add_global(struct timer_list *timer);
 
 extern int try_to_del_timer_sync(struct timer_list *timer);
kernel/time/timer.c +3 -3
index 47165b16380a..3fd0b13c0b74 100644
@@ -1293,21 +1293,21 @@ void add_timer(struct timer_list *timer)
 EXPORT_SYMBOL(add_timer);
 
 /**
- * add_timer_local() - Start a timer on the local CPU
+ * timer_add_local() - Start a timer on the local CPU
  * @timer:	The timer to be started
  *
  * Same as add_timer() except that the timer flag TIMER_PINNED is set.
  *
  * See add_timer() for further details.
  */
-void add_timer_local(struct timer_list *timer)
+void timer_add_local(struct timer_list *timer)
 {
 	if (WARN_ON_ONCE(timer_pending(timer)))
 		return;
 	timer->flags |= TIMER_PINNED;
 	__mod_timer(timer, timer->expires, MOD_TIMER_NOTPENDING);
 }
-EXPORT_SYMBOL(add_timer_local);
+EXPORT_SYMBOL(timer_add_local);
 
 /**
  * timer_add_global() - Start a timer without TIMER_PINNED flag set
Signature · 1 line
2.45.2
#14 lore raw

PATCH 5/17 treewide, timers: Rename from_timer() => timer_container_of()

In reply to Ingo Molnar

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

---
 arch/alpha/kernel/srmcons.c                        |  2 +-
 arch/powerpc/kvm/booke.c                           |  2 +-
 arch/powerpc/platforms/powermac/low_i2c.c          |  2 +-
 arch/sh/drivers/heartbeat.c                        |  2 +-
 arch/sh/drivers/pci/common.c                       |  4 ++--
 arch/sh/drivers/push-switch.c                      |  2 +-
 arch/sparc/kernel/viohs.c                          |  2 +-
 arch/um/drivers/vector_kern.c                      |  2 +-
 arch/x86/kvm/xen.c                                 |  2 +-
 arch/xtensa/platforms/iss/network.c                |  2 +-
 block/blk-core.c                                   |  2 +-
 block/blk-iolatency.c                              |  2 +-
 block/blk-stat.c                                   |  2 +-
 block/blk-throttle.c                               |  2 +-
 block/kyber-iosched.c                              |  2 +-
 drivers/accel/qaic/qaic_timesync.c                 |  2 +-
 drivers/acpi/apei/ghes.c                           |  2 +-
 drivers/ata/libahci.c                              |  2 +-
 drivers/ata/libata-eh.c                            |  2 +-
 drivers/atm/idt77252.c                             |  4 ++--
 drivers/atm/lanai.c                                |  2 +-
 drivers/auxdisplay/line-display.c                  |  2 +-
 drivers/base/power/main.c                          |  2 +-
 drivers/base/power/wakeup.c                        |  2 +-
 drivers/block/aoe/aoecmd.c                         |  2 +-
 drivers/block/aoe/aoedev.c                         |  2 +-
 drivers/block/drbd/drbd_main.c                     |  2 +-
 drivers/block/drbd/drbd_req.c                      |  2 +-
 drivers/block/drbd/drbd_worker.c                   |  4 ++--
 drivers/block/swim3.c                              |  8 +++----
 drivers/bluetooth/bluecard_cs.c                    |  2 +-
 drivers/bluetooth/btnxpuart.c                      |  2 +-
 drivers/bluetooth/hci_bcsp.c                       |  2 +-
 drivers/bluetooth/hci_h5.c                         |  2 +-
 drivers/bluetooth/hci_qca.c                        |  4 ++--
 drivers/bus/mhi/host/pci_generic.c                 |  2 +-
 drivers/char/hw_random/xgene-rng.c                 |  2 +-
 drivers/char/ipmi/bt-bmc.c                         |  2 +-
 drivers/char/ipmi/ipmi_si_intf.c                   |  2 +-
 drivers/char/ipmi/ipmi_ssif.c                      |  4 ++--
 drivers/char/ipmi/ssif_bmc.c                       |  2 +-
 drivers/char/tpm/tpm-dev-common.c                  |  2 +-
 drivers/comedi/drivers/comedi_test.c               |  4 ++--
 drivers/comedi/drivers/das16.c                     |  2 +-
 drivers/comedi/drivers/jr3_pci.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                             |  2 +-
 drivers/firewire/core-transaction.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           |  2 +-
 drivers/gpu/drm/gud/gud_pipe.c                     |  2 +-
 drivers/gpu/drm/i915/gt/intel_rps.c                |  2 +-
 drivers/gpu/drm/i915/gt/mock_engine.c              |  2 +-
 drivers/gpu/drm/i915/gt/selftest_migrate.c         |  2 +-
 drivers/gpu/drm/i915/i915_sw_fence.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/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/greybus/operation.c                        |  2 +-
 drivers/hid/hid-apple.c                            |  2 +-
 drivers/hid/hid-appleir.c                          |  2 +-
 drivers/hid/hid-appletb-kbd.c                      |  2 +-
 drivers/hid/hid-letsketch.c                        |  2 +-
 drivers/hid/hid-magicmouse.c                       |  2 +-
 drivers/hid/hid-multitouch.c                       |  2 +-
 drivers/hid/hid-prodikeys.c                        |  2 +-
 drivers/hid/hid-sony.c                             |  2 +-
 drivers/hid/hid-uclogic-core.c                     |  2 +-
 drivers/hid/hid-wiimote-core.c                     |  2 +-
 drivers/hid/usbhid/hid-core.c                      |  2 +-
 drivers/hid/wacom_wac.c                            |  2 +-
 drivers/hsi/clients/ssi_protocol.c                 |  6 ++---
 drivers/hwmon/npcm750-pwm-fan.c                    |  2 +-
 drivers/hwmon/pwm-fan.c                            |  2 +-
 drivers/i2c/busses/i2c-img-scb.c                   |  2 +-
 drivers/iio/common/ssp_sensors/ssp_dev.c           |  2 +-
 drivers/infiniband/hw/cxgb4/cm.c                   |  2 +-
 drivers/infiniband/hw/hfi1/aspm.c                  |  2 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  4 ++--
 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                 |  2 +-
 drivers/infiniband/hw/irdma/cm.c                   |  2 +-
 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             |  2 +-
 drivers/infiniband/hw/qib/qib_iba6120.c            |  4 ++--
 drivers/infiniband/hw/qib/qib_iba7220.c            |  4 ++--
 drivers/infiniband/hw/qib/qib_iba7322.c            |  4 ++--
 drivers/infiniband/hw/qib/qib_init.c               |  2 +-
 drivers/infiniband/hw/qib/qib_intr.c               |  2 +-
 drivers/infiniband/hw/qib/qib_mad.c                |  2 +-
 drivers/infiniband/hw/qib/qib_sd7220.c             |  2 +-
 drivers/infiniband/hw/qib/qib_tx.c                 |  2 +-
 drivers/infiniband/hw/qib/qib_verbs.c              |  2 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |  2 +-
 drivers/infiniband/sw/rxe/rxe_comp.c               |  2 +-
 drivers/infiniband/sw/rxe/rxe_req.c                |  2 +-
 drivers/input/ff-memless.c                         |  2 +-
 drivers/input/gameport/gameport.c                  |  2 +-
 drivers/input/input.c                              |  2 +-
 drivers/input/joystick/db9.c                       |  2 +-
 drivers/input/joystick/gamecon.c                   |  2 +-
 drivers/input/joystick/turbografx.c                |  2 +-
 drivers/input/keyboard/imx_keypad.c                |  2 +-
 drivers/input/keyboard/locomokbd.c                 |  2 +-
 drivers/input/keyboard/snvs_pwrkey.c               |  2 +-
 drivers/input/keyboard/tegra-kbc.c                 |  2 +-
 drivers/input/misc/nxp-bbnsm-pwrkey.c              |  2 +-
 drivers/input/mouse/alps.c                         |  2 +-
 drivers/input/mouse/byd.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/hardware/mISDN/hfcpci.c               |  2 +-
 drivers/isdn/hardware/mISDN/mISDNipac.c            |  2 +-
 drivers/isdn/hardware/mISDN/mISDNisar.c            |  2 +-
 drivers/isdn/hardware/mISDN/w6692.c                |  2 +-
 drivers/isdn/mISDN/dsp_tones.c                     |  2 +-
 drivers/isdn/mISDN/fsm.c                           |  2 +-
 drivers/isdn/mISDN/l1oip_core.c                    |  4 ++--
 drivers/isdn/mISDN/timerdev.c                      |  2 +-
 drivers/leds/flash/leds-rt8515.c                   |  2 +-
 drivers/leds/flash/leds-sgm3140.c                  |  2 +-
 drivers/leds/led-core.c                            |  2 +-
 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/mailbox/mailbox-altera.c                   |  2 +-
 drivers/md/bcache/stats.c                          |  2 +-
 drivers/md/dm-delay.c                              |  2 +-
 drivers/md/dm-integrity.c                          |  2 +-
 drivers/md/dm-mpath.c                              |  2 +-
 drivers/md/dm-raid1.c                              |  2 +-
 drivers/md/dm-vdo/dedupe.c                         |  2 +-
 drivers/md/dm-writecache.c                         |  4 ++--
 drivers/md/md.c                                    |  2 +-
 drivers/media/common/saa7146/saa7146_fops.c        |  2 +-
 drivers/media/common/saa7146/saa7146_vbi.c         |  2 +-
 drivers/media/dvb-core/dmxdev.c                    |  2 +-
 drivers/media/i2c/tc358743.c                       |  2 +-
 drivers/media/i2c/tvaudio.c                        |  2 +-
 drivers/media/pci/bt8xx/bttv-driver.c              |  2 +-
 drivers/media/pci/bt8xx/bttv-input.c               |  4 ++--
 drivers/media/pci/cx18/cx18-fileops.c              |  2 +-
 drivers/media/pci/ivtv/ivtv-irq.c                  |  2 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c |  2 +-
 drivers/media/pci/saa7134/saa7134-core.c           |  2 +-
 drivers/media/pci/saa7134/saa7134-input.c          |  2 +-
 drivers/media/pci/tw686x/tw686x-core.c             |  2 +-
 drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c   |  2 +-
 .../platform/st/sti/c8sectpfe/c8sectpfe-core.c     |  2 +-
 drivers/media/radio/radio-cadet.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                       |  2 +-
 drivers/media/rc/rc-main.c                         |  4 ++--
 drivers/media/usb/au0828/au0828-dvb.c              |  2 +-
 drivers/media/usb/au0828/au0828-video.c            |  4 ++--
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            | 10 ++++----
 drivers/media/usb/s2255/s2255drv.c                 |  2 +-
 drivers/memory/tegra/tegra210-emc-core.c           |  4 ++--
 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                   |  2 +-
 drivers/misc/cardreader/rtsx_usb.c                 |  2 +-
 drivers/misc/sgi-xp/xpc_main.c                     |  2 +-
 drivers/misc/sgi-xp/xpc_partition.c                |  4 ++--
 drivers/mmc/core/host.c                            |  2 +-
 drivers/mmc/host/atmel-mci.c                       |  4 ++--
 drivers/mmc/host/dw_mmc.c                          |  6 ++---
 drivers/mmc/host/jz4740_mmc.c                      |  2 +-
 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                          |  4 ++--
 drivers/mmc/host/wbsd.c                            |  2 +-
 drivers/most/most_usb.c                            |  2 +-
 drivers/mtd/sm_ftl.c                               |  2 +-
 drivers/net/arcnet/arcnet.c                        |  2 +-
 drivers/net/can/grcan.c                            |  4 ++--
 drivers/net/can/kvaser_pciefd.c                    |  2 +-
 drivers/net/can/sja1000/peak_pcmcia.c              |  2 +-
 drivers/net/can/usb/peak_usb/pcan_usb.c            |  2 +-
 drivers/net/dsa/mv88e6xxx/phy.c                    |  2 +-
 drivers/net/eql.c                                  |  2 +-
 drivers/net/ethernet/3com/3c515.c                  |  2 +-
 drivers/net/ethernet/3com/3c574_cs.c               |  2 +-
 drivers/net/ethernet/3com/3c589_cs.c               |  2 +-
 drivers/net/ethernet/3com/3c59x.c                  |  2 +-
 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       |  2 +-
 drivers/net/ethernet/amd/a2065.c                   |  2 +-
 drivers/net/ethernet/amd/amd8111e.c                |  2 +-
 drivers/net/ethernet/amd/declance.c                |  2 +-
 drivers/net/ethernet/amd/pcnet32.c                 |  2 +-
 drivers/net/ethernet/amd/pds_core/main.c           |  2 +-
 drivers/net/ethernet/amd/sunlance.c                |  2 +-
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |  4 ++--
 drivers/net/ethernet/apple/bmac.c                  |  2 +-
 drivers/net/ethernet/apple/mace.c                  |  2 +-
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |  4 ++--
 drivers/net/ethernet/atheros/ag71xx.c              |  2 +-
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |  2 +-
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |  2 +-
 drivers/net/ethernet/atheros/atlx/atl1.c           |  2 +-
 drivers/net/ethernet/atheros/atlx/atl2.c           |  4 ++--
 drivers/net/ethernet/broadcom/b44.c                |  2 +-
 drivers/net/ethernet/broadcom/bcm63xx_enet.c       |  4 ++--
 drivers/net/ethernet/broadcom/bnx2.c               |  2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  2 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  2 +-
 drivers/net/ethernet/broadcom/tg3.c                |  2 +-
 drivers/net/ethernet/brocade/bna/bnad.c            | 12 +++++-----
 drivers/net/ethernet/chelsio/cxgb/sge.c            |  6 ++---
 drivers/net/ethernet/chelsio/cxgb3/sge.c           |  4 ++--
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c   |  2 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |  4 ++--
 drivers/net/ethernet/chelsio/cxgb4vf/sge.c         |  4 ++--
 drivers/net/ethernet/cisco/enic/enic_clsf.c        |  2 +-
 drivers/net/ethernet/cisco/enic/enic_main.c        |  2 +-
 drivers/net/ethernet/dec/tulip/de2104x.c           |  4 ++--
 drivers/net/ethernet/dec/tulip/dmfe.c              |  2 +-
 drivers/net/ethernet/dec/tulip/interrupt.c         |  2 +-
 drivers/net/ethernet/dec/tulip/pnic.c              |  2 +-
 drivers/net/ethernet/dec/tulip/pnic2.c             |  2 +-
 drivers/net/ethernet/dec/tulip/timer.c             |  4 ++--
 drivers/net/ethernet/dec/tulip/tulip_core.c        |  2 +-
 drivers/net/ethernet/dec/tulip/uli526x.c           |  2 +-
 drivers/net/ethernet/dec/tulip/winbond-840.c       |  2 +-
 drivers/net/ethernet/dlink/dl2k.c                  |  2 +-
 drivers/net/ethernet/fealnx.c                      |  4 ++--
 drivers/net/ethernet/google/gve/gve_main.c         |  2 +-
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      |  2 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c    |  2 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c  |  2 +-
 drivers/net/ethernet/intel/e100.c                  |  2 +-
 drivers/net/ethernet/intel/e1000e/netdev.c         |  4 ++--
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |  2 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  2 +-
 drivers/net/ethernet/intel/ice/ice_main.c          |  2 +-
 drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c |  2 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |  4 ++--
 drivers/net/ethernet/intel/igbvf/netdev.c          |  2 +-
 drivers/net/ethernet/intel/igc/igc_main.c          |  4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  2 +-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |  2 +-
 drivers/net/ethernet/korina.c                      |  2 +-
 drivers/net/ethernet/marvell/mv643xx_eth.c         |  4 ++--
 drivers/net/ethernet/marvell/pxa168_eth.c          |  2 +-
 drivers/net/ethernet/marvell/skge.c                |  2 +-
 drivers/net/ethernet/marvell/sky2.c                |  2 +-
 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/micrel/ksz884x.c              |  4 ++--
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |  2 +-
 drivers/net/ethernet/natsemi/natsemi.c             |  2 +-
 drivers/net/ethernet/natsemi/ns83820.c             |  2 +-
 drivers/net/ethernet/neterion/s2io.c               |  2 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |  2 +-
 drivers/net/ethernet/nvidia/forcedeth.c            |  6 ++---
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |  2 +-
 drivers/net/ethernet/packetengines/hamachi.c       |  2 +-
 drivers/net/ethernet/packetengines/yellowfin.c     |  2 +-
 drivers/net/ethernet/pasemi/pasemi_mac.c           |  2 +-
 drivers/net/ethernet/pensando/ionic/ionic_dev.c    |  2 +-
 drivers/net/ethernet/qlogic/qla3xxx.c              |  2 +-
 drivers/net/ethernet/realtek/atp.c                 |  2 +-
 drivers/net/ethernet/rocker/rocker_ofdpa.c         |  2 +-
 drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |  4 ++--
 drivers/net/ethernet/seeq/ether3.c                 |  2 +-
 drivers/net/ethernet/sfc/falcon/falcon.c           |  2 +-
 drivers/net/ethernet/sfc/falcon/rx.c               |  2 +-
 drivers/net/ethernet/sfc/mcdi.c                    |  2 +-
 drivers/net/ethernet/sfc/rx_common.c               |  2 +-
 drivers/net/ethernet/sfc/siena/mcdi.c              |  2 +-
 drivers/net/ethernet/sfc/siena/rx_common.c         |  2 +-
 drivers/net/ethernet/sgi/ioc3-eth.c                |  2 +-
 drivers/net/ethernet/sis/sis190.c                  |  2 +-
 drivers/net/ethernet/sis/sis900.c                  |  2 +-
 drivers/net/ethernet/smsc/epic100.c                |  2 +-
 drivers/net/ethernet/smsc/smc91c92_cs.c            |  2 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c   |  2 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  2 +-
 drivers/net/ethernet/sun/cassini.c                 |  2 +-
 drivers/net/ethernet/sun/niu.c                     |  2 +-
 drivers/net/ethernet/sun/sunbmac.c                 |  2 +-
 drivers/net/ethernet/sun/sungem.c                  |  2 +-
 drivers/net/ethernet/sun/sunhme.c                  |  2 +-
 drivers/net/ethernet/sun/sunvnet_common.c          |  2 +-
 drivers/net/ethernet/synopsys/dwc-xlgmac-net.c     |  2 +-
 drivers/net/ethernet/ti/cpsw_ale.c                 |  2 +-
 drivers/net/ethernet/ti/netcp_ethss.c              |  2 +-
 drivers/net/ethernet/ti/tlan.c                     |  4 ++--
 drivers/net/ethernet/tundra/tsi108_eth.c           |  2 +-
 drivers/net/fddi/defza.c                           |  2 +-
 drivers/net/hamradio/6pack.c                       |  4 ++--
 drivers/net/hamradio/scc.c                         | 14 +++++------
 drivers/net/hippi/rrunner.c                        |  2 +-
 drivers/net/ntb_netdev.c                           |  2 +-
 drivers/net/slip/slip.c                            |  4 ++--
 drivers/net/tun.c                                  |  2 +-
 drivers/net/usb/catc.c                             |  2 +-
 drivers/net/usb/lan78xx.c                          |  2 +-
 drivers/net/usb/sierra_net.c                       |  2 +-
 drivers/net/usb/usbnet.c                           |  2 +-
 drivers/net/vxlan/vxlan_core.c                     |  2 +-
 drivers/net/wan/hdlc_cisco.c                       |  2 +-
 drivers/net/wan/hdlc_fr.c                          |  2 +-
 drivers/net/wan/hdlc_ppp.c                         |  2 +-
 drivers/net/wireguard/timers.c                     | 10 ++++----
 drivers/net/wireless/ath/ar5523/ar5523.c           |  2 +-
 drivers/net/wireless/ath/ath10k/htt_rx.c           |  2 +-
 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               |  2 +-
 drivers/net/wireless/ath/ath11k/dp.c               |  2 +-
 drivers/net/wireless/ath/ath11k/dp_rx.c            |  4 ++--
 drivers/net/wireless/ath/ath12k/ce.c               |  2 +-
 drivers/net/wireless/ath/ath12k/dp.c               |  2 +-
 drivers/net/wireless/ath/ath12k/dp_rx.c            |  2 +-
 drivers/net/wireless/ath/ath6kl/main.c             |  2 +-
 drivers/net/wireless/ath/ath6kl/recovery.c         |  2 +-
 drivers/net/wireless/ath/ath6kl/txrx.c             |  2 +-
 drivers/net/wireless/ath/ath6kl/wmi.c              |  2 +-
 drivers/net/wireless/ath/ath9k/channel.c           |  4 ++--
 drivers/net/wireless/ath/ath9k/gpio.c              |  4 ++--
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |  2 +-
 drivers/net/wireless/ath/ath9k/link.c              |  2 +-
 drivers/net/wireless/ath/ath9k/main.c              |  2 +-
 drivers/net/wireless/ath/wcn36xx/dxe.c             |  2 +-
 drivers/net/wireless/ath/wil6210/netdev.c          |  6 ++---
 .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c  |  2 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |  2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  2 +-
 drivers/net/wireless/intel/ipw2x00/libipw_crypto.c |  2 +-
 drivers/net/wireless/intel/iwlegacy/3945-rs.c      |  2 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |  2 +-
 drivers/net/wireless/intel/iwlegacy/common.c       |  2 +-
 drivers/net/wireless/intel/iwlwifi/dvm/main.c      |  4 ++--
 drivers/net/wireless/intel/iwlwifi/dvm/tt.c        |  4 ++--
 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c   |  2 +-
 drivers/net/wireless/intel/iwlwifi/mld/agg.c       |  2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |  2 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |  2 +-
 drivers/net/wireless/marvell/libertas/if_usb.c     |  2 +-
 drivers/net/wireless/marvell/libertas/main.c       |  4 ++--
 drivers/net/wireless/marvell/libertas_tf/if_usb.c  |  2 +-
 drivers/net/wireless/marvell/libertas_tf/main.c    |  2 +-
 .../net/wireless/marvell/mwifiex/11n_rxreorder.c   |  2 +-
 drivers/net/wireless/marvell/mwifiex/cmdevt.c      |  2 +-
 drivers/net/wireless/marvell/mwifiex/init.c        |  2 +-
 drivers/net/wireless/marvell/mwifiex/tdls.c        |  2 +-
 drivers/net/wireless/marvell/mwifiex/usb.c         |  2 +-
 drivers/net/wireless/mediatek/mt76/mt7615/main.c   |  2 +-
 drivers/net/wireless/mediatek/mt76/mt792x_core.c   |  4 ++--
 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    |  2 +-
 drivers/net/wireless/realtek/rtw88/tx.c            |  2 +-
 drivers/net/wireless/rsi/rsi_91x_hal.c             |  2 +-
 drivers/net/wireless/rsi/rsi_91x_mac80211.c        |  2 +-
 drivers/net/wireless/st/cw1200/queue.c             |  2 +-
 drivers/net/wireless/st/cw1200/sta.c               |  2 +-
 drivers/net/wireless/ti/wlcore/main.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                          |  2 +-
 drivers/nfc/pn533/uart.c                           |  2 +-
 drivers/nfc/st-nci/ndlc.c                          |  4 ++--
 drivers/nfc/st-nci/se.c                            |  4 ++--
 drivers/nfc/st21nfca/se.c                          |  4 ++--
 drivers/nvme/host/multipath.c                      |  2 +-
 drivers/parport/ieee1284.c                         |  2 +-
 drivers/pci/hotplug/cpqphp_ctrl.c                  |  2 +-
 drivers/pci/hotplug/shpchp_hpc.c                   |  2 +-
 drivers/pcmcia/bcm63xx_pcmcia.c                    |  2 +-
 drivers/pcmcia/electra_cf.c                        |  2 +-
 drivers/pcmcia/omap_cf.c                           |  2 +-
 drivers/pcmcia/pd6729.c                            |  2 +-
 drivers/pcmcia/soc_common.c                        |  2 +-
 drivers/pcmcia/yenta_socket.c                      |  2 +-
 drivers/platform/x86/intel_ips.c                   |  2 +-
 drivers/pps/clients/pps-gpio.c                     |  2 +-
 drivers/ptp/ptp_ocp.c                              |  2 +-
 drivers/rtc/dev.c                                  |  2 +-
 drivers/rtc/rtc-test.c                             |  2 +-
 drivers/s390/block/dasd.c                          |  4 ++--
 drivers/s390/char/con3215.c                        |  2 +-
 drivers/s390/char/con3270.c                        |  2 +-
 drivers/s390/char/tape_core.c                      |  2 +-
 drivers/s390/char/tape_std.c                       |  2 +-
 drivers/s390/cio/device_fsm.c                      |  2 +-
 drivers/s390/cio/eadm_sch.c                        |  2 +-
 drivers/s390/crypto/ap_bus.c                       |  2 +-
 drivers/s390/net/fsm.c                             |  2 +-
 drivers/s390/net/qeth_core_main.c                  |  2 +-
 drivers/s390/scsi/zfcp_erp.c                       |  4 ++--
 drivers/s390/scsi/zfcp_fsf.c                       |  2 +-
 drivers/s390/scsi/zfcp_qdio.c                      |  2 +-
 drivers/scsi/aic7xxx/aic79xx_core.c                |  2 +-
 drivers/scsi/aic94xx/aic94xx_scb.c                 |  2 +-
 drivers/scsi/aic94xx/aic94xx_tmf.c                 |  4 ++--
 drivers/scsi/arcmsr/arcmsr_hba.c                   |  4 ++--
 drivers/scsi/arm/fas216.c                          |  2 +-
 drivers/scsi/be2iscsi/be_main.c                    |  4 ++--
 drivers/scsi/bfa/bfad.c                            |  2 +-
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |  2 +-
 drivers/scsi/bnx2fc/bnx2fc_tgt.c                   |  4 ++--
 drivers/scsi/bnx2i/bnx2i_hwi.c                     |  2 +-
 drivers/scsi/csiostor/csio_hw.c                    |  4 ++--
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c                 |  2 +-
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |  2 +-
 drivers/scsi/dc395x.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/esas2r/esas2r_main.c                  |  2 +-
 drivers/scsi/fcoe/fcoe_ctlr.c                      |  2 +-
 drivers/scsi/fcoe/fcoe_transport.c                 |  2 +-
 drivers/scsi/fnic/fdls_disc.c                      |  6 ++---
 drivers/scsi/fnic/fip.c                            |  8 +++----
 drivers/scsi/fnic/fnic_main.c                      |  2 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c              |  2 +-
 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                     |  4 ++--
 drivers/scsi/ibmvscsi/ibmvscsi.c                   |  2 +-
 drivers/scsi/ipr.c                                 |  8 +++----
 drivers/scsi/isci/host.c                           |  6 ++---
 drivers/scsi/isci/phy.c                            |  2 +-
 drivers/scsi/isci/port.c                           |  2 +-
 drivers/scsi/isci/port_config.c                    |  4 ++--
 drivers/scsi/libfc/fc_fcp.c                        |  4 ++--
 drivers/scsi/libiscsi.c                            |  4 ++--
 drivers/scsi/libsas/sas_scsi_host.c                |  2 +-
 drivers/scsi/lpfc/lpfc_ct.c                        |  2 +-
 drivers/scsi/lpfc/lpfc_els.c                       |  6 ++---
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |  2 +-
 drivers/scsi/lpfc/lpfc_init.c                      |  8 +++----
 drivers/scsi/lpfc/lpfc_scsi.c                      |  2 +-
 drivers/scsi/lpfc/lpfc_sli.c                       |  6 ++---
 drivers/scsi/megaraid/megaraid_mbox.c              |  2 +-
 drivers/scsi/megaraid/megaraid_mm.c                |  2 +-
 drivers/scsi/megaraid/megaraid_sas_base.c          |  2 +-
 drivers/scsi/mvsas/mv_sas.c                        |  2 +-
 drivers/scsi/ncr53c8xx.c                           |  2 +-
 drivers/scsi/pmcraid.c                             |  6 ++---
 drivers/scsi/qla1280.c                             |  2 +-
 drivers/scsi/qla2xxx/qla_edif.c                    |  2 +-
 drivers/scsi/qla2xxx/qla_init.c                    |  2 +-
 drivers/scsi/qla2xxx/qla_os.c                      |  2 +-
 drivers/scsi/qla4xxx/ql4_os.c                      |  2 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |  2 +-
 drivers/scsi/sym53c8xx_2/sym_glue.c                |  2 +-
 .../staging/gpib/agilent_82357a/agilent_82357a.c   |  2 +-
 drivers/staging/gpib/common/gpib_os.c              |  4 ++--
 drivers/staging/gpib/common/iblib.c                |  2 +-
 drivers/staging/gpib/ni_usb/ni_usb_gpib.c          |  2 +-
 drivers/staging/media/imx/imx-ic-prpencvf.c        |  2 +-
 drivers/staging/media/imx/imx-media-csi.c          |  2 +-
 drivers/staging/rtl8723bs/core/rtw_cmd.c           |  8 +++----
 drivers/staging/rtl8723bs/core/rtw_mlme.c          |  4 ++--
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      |  8 +++----
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c       |  4 ++--
 drivers/staging/rtl8723bs/core/rtw_recv.c          |  4 ++--
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h   |  2 +-
 drivers/staging/rtl8723bs/os_dep/mlme_linux.c      |  4 ++--
 drivers/target/iscsi/iscsi_target_erl0.c           |  2 +-
 drivers/target/iscsi/iscsi_target_erl1.c           |  2 +-
 drivers/target/iscsi/iscsi_target_util.c           |  6 ++---
 drivers/target/target_core_user.c                  |  4 ++--
 drivers/tty/ipwireless/hardware.c                  |  2 +-
 drivers/tty/mips_ejtag_fdc.c                       |  2 +-
 drivers/tty/n_gsm.c                                |  8 +++----
 drivers/tty/serial/8250/8250_aspeed_vuart.c        |  2 +-
 drivers/tty/serial/8250/8250_core.c                |  4 ++--
 drivers/tty/serial/altera_uart.c                   |  2 +-
 drivers/tty/serial/amba-pl011.c                    |  2 +-
 drivers/tty/serial/atmel_serial.c                  |  2 +-
 drivers/tty/serial/fsl_lpuart.c                    |  2 +-
 drivers/tty/serial/imx.c                           |  2 +-
 drivers/tty/serial/liteuart.c                      |  2 +-
 drivers/tty/serial/max3100.c                       |  2 +-
 drivers/tty/serial/sa1100.c                        |  2 +-
 drivers/tty/serial/sccnxp.c                        |  2 +-
 drivers/tty/serial/sh-sci.c                        |  2 +-
 drivers/tty/synclink_gt.c                          |  4 ++--
 drivers/tty/sysrq.c                                |  2 +-
 drivers/tty/vcc.c                                  |  4 ++--
 drivers/usb/atm/cxacru.c                           |  2 +-
 drivers/usb/atm/speedtch.c                         |  4 ++--
 drivers/usb/atm/usbatm.c                           |  2 +-
 drivers/usb/core/hcd.c                             |  2 +-
 drivers/usb/core/hub.c                             |  2 +-
 drivers/usb/dwc2/hcd.c                             |  2 +-
 drivers/usb/dwc2/hcd_queue.c                       |  2 +-
 drivers/usb/gadget/udc/at91_udc.c                  |  2 +-
 drivers/usb/gadget/udc/dummy_hcd.c                 |  2 +-
 drivers/usb/gadget/udc/m66592-udc.c                |  2 +-
 drivers/usb/gadget/udc/omap_udc.c                  |  2 +-
 drivers/usb/gadget/udc/pxa25x_udc.c                |  2 +-
 drivers/usb/gadget/udc/r8a66597-udc.c              |  2 +-
 drivers/usb/host/ehci-platform.c                   |  2 +-
 drivers/usb/host/ohci-hcd.c                        |  2 +-
 drivers/usb/host/oxu210hp-hcd.c                    |  2 +-
 drivers/usb/host/r8a66597-hcd.c                    |  6 ++---
 drivers/usb/host/sl811-hcd.c                       |  2 +-
 drivers/usb/host/uhci-q.c                          |  2 +-
 drivers/usb/host/xen-hcd.c                         |  2 +-
 drivers/usb/host/xhci.c                            |  2 +-
 drivers/usb/isp1760/isp1760-udc.c                  |  2 +-
 drivers/usb/misc/usbtest.c                         |  2 +-
 drivers/usb/musb/da8xx.c                           |  2 +-
 drivers/usb/musb/mpfs.c                            |  2 +-
 drivers/usb/musb/musb_core.c                       |  2 +-
 drivers/usb/musb/musb_dsps.c                       |  2 +-
 drivers/usb/musb/tusb6010.c                        |  2 +-
 drivers/usb/phy/phy-mv-usb.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                  |  2 +-
 drivers/video/fbdev/aty/radeon_base.c              |  2 +-
 drivers/virt/vboxguest/vboxguest_core.c            |  2 +-
 drivers/watchdog/at91sam9_wdt.c                    |  2 +-
 drivers/watchdog/bcm47xx_wdt.c                     |  2 +-
 drivers/watchdog/lpc18xx_wdt.c                     |  2 +-
 drivers/watchdog/shwdt.c                           |  2 +-
 fs/dlm/lock.c                                      |  2 +-
 fs/ext4/super.c                                    |  2 +-
 fs/jbd2/journal.c                                  |  2 +-
 fs/nilfs2/segment.c                                |  2 +-
 fs/ocfs2/cluster/tcp.c                             |  2 +-
 include/linux/timer.h                              |  2 +-
 kernel/kthread.c                                   |  2 +-
 kernel/rcu/tasks.h                                 |  2 +-
 kernel/rcu/tree_nocb.h                             |  2 +-
 kernel/sched/psi.c                                 |  2 +-
 kernel/time/sleep_timeout.c                        |  2 +-
 kernel/workqueue.c                                 |  6 ++---
 mm/page-writeback.c                                |  4 ++--
 net/802/garp.c                                     |  2 +-
 net/802/mrp.c                                      |  4 ++--
 net/appletalk/ddp.c                                |  2 +-
 net/atm/lec.c                                      |  4 ++--
 net/ax25/af_ax25.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_multicast.c                          | 28 +++++++++++-----------
 net/bridge/br_multicast_eht.c                      |  4 ++--
 net/bridge/br_stp_timer.c                          | 12 +++++-----
 net/can/proc.c                                     |  2 +-
 net/core/drop_monitor.c                            |  2 +-
 net/core/gen_estimator.c                           |  2 +-
 net/core/neighbour.c                               |  4 ++--
 net/dccp/ccids/ccid2.c                             |  2 +-
 net/dccp/ccids/ccid3.c                             |  2 +-
 net/dccp/timer.c                                   |  8 +++----
 net/hsr/hsr_device.c                               |  4 ++--
 net/hsr/hsr_framereg.c                             |  4 ++--
 net/ieee802154/6lowpan/reassembly.c                |  2 +-
 net/ipv4/igmp.c                                    |  6 ++---
 net/ipv4/inet_connection_sock.c                    |  6 ++---
 net/ipv4/inet_timewait_sock.c                      |  2 +-
 net/ipv4/ip_fragment.c                             |  2 +-
 net/ipv4/ipmr.c                                    |  2 +-
 net/ipv4/tcp_timer.c                               |  6 ++---
 net/ipv6/addrconf.c                                |  2 +-
 net/ipv6/ip6_fib.c                                 |  2 +-
 net/ipv6/ip6mr.c                                   |  2 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c            |  2 +-
 net/ipv6/reassembly.c                              |  2 +-
 net/lapb/lapb_timer.c                              |  4 ++--
 net/llc/llc_c_ac.c                                 |  8 +++----
 net/mac80211/agg-rx.c                              |  4 ++--
 net/mac80211/agg-tx.c                              |  4 ++--
 net/mac80211/ibss.c                                |  2 +-
 net/mac80211/led.c                                 |  2 +-
 net/mac80211/mesh.c                                |  6 ++---
 net/mac80211/mesh_hwmp.c                           |  2 +-
 net/mac80211/mesh_plink.c                          |  2 +-
 net/mac80211/mlme.c                                |  8 +++----
 net/mac80211/ocb.c                                 |  2 +-
 net/mac80211/sta_info.c                            |  2 +-
 net/mptcp/pm.c                                     |  2 +-
 net/mptcp/protocol.c                               |  4 ++--
 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                     |  2 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |  2 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |  2 +-
 net/netfilter/nf_conntrack_expect.c                |  2 +-
 net/netfilter/nfnetlink_log.c                      |  2 +-
 net/netfilter/xt_IDLETIMER.c                       |  2 +-
 net/netfilter/xt_LED.c                             |  2 +-
 net/netrom/af_netrom.c                             |  2 +-
 net/netrom/nr_timer.c                              | 10 ++++----
 net/nfc/core.c                                     |  2 +-
 net/nfc/hci/core.c                                 |  2 +-
 net/nfc/hci/llc_shdlc.c                            |  6 ++---
 net/nfc/llcp_core.c                                |  4 ++--
 net/nfc/nci/core.c                                 |  4 ++--
 net/packet/af_packet.c                             |  2 +-
 net/rose/af_rose.c                                 |  2 +-
 net/rose/rose_link.c                               |  2 +-
 net/rose/rose_timer.c                              |  6 ++---
 net/rxrpc/call_object.c                            |  2 +-
 net/sched/cls_flow.c                               |  2 +-
 net/sched/sch_fq_pie.c                             |  2 +-
 net/sched/sch_generic.c                            |  2 +-
 net/sched/sch_pie.c                                |  2 +-
 net/sched/sch_red.c                                |  2 +-
 net/sched/sch_sfq.c                                |  2 +-
 net/sctp/protocol.c                                |  2 +-
 net/sctp/sm_sideeffect.c                           | 24 +++++++++----------
 net/sunrpc/svc_xprt.c                              |  2 +-
 net/sunrpc/xprt.c                                  |  2 +-
 net/tipc/discover.c                                |  2 +-
 net/tipc/monitor.c                                 |  2 +-
 net/tipc/node.c                                    |  2 +-
 net/tipc/socket.c                                  |  2 +-
 net/tipc/subscr.c                                  |  2 +-
 net/wireless/core.c                                |  2 +-
 net/x25/af_x25.c                                   |  2 +-
 net/x25/x25_link.c                                 |  2 +-
 net/x25/x25_timer.c                                |  4 ++--
 net/xfrm/xfrm_policy.c                             |  4 ++--
 net/xfrm/xfrm_state.c                              |  2 +-
 sound/core/timer.c                                 |  2 +-
 sound/drivers/aloop.c                              |  2 +-
 sound/drivers/dummy.c                              |  2 +-
 sound/drivers/mpu401/mpu401_uart.c                 |  2 +-
 sound/drivers/mtpav.c                              |  2 +-
 sound/drivers/opl3/opl3_midi.c                     |  2 +-
 sound/drivers/pcmtest.c                            |  2 +-
 sound/drivers/serial-u16550.c                      |  2 +-
 sound/i2c/other/ak4117.c                           |  2 +-
 sound/isa/sb/emu8000_pcm.c                         |  2 +-
 sound/isa/sb/sb8_midi.c                            |  2 +-
 sound/isa/wavefront/wavefront_midi.c               |  2 +-
 sound/pci/asihpi/asihpi.c                          |  2 +-
 sound/pci/ctxfi/cttimer.c                          |  2 +-
 sound/pci/echoaudio/midi.c                         |  2 +-
 sound/pci/korg1212/korg1212.c                      |  2 +-
 sound/pci/rme9652/hdsp.c                           |  2 +-
 sound/pci/rme9652/hdspm.c                          |  2 +-
 sound/sh/aica.c                                    |  2 +-
 sound/soc/codecs/rt5645.c                          |  2 +-
 sound/soc/fsl/imx-pcm-rpmsg.c                      |  2 +-
 sound/synth/emux/emux_synth.c                      |  2 +-
 sound/usb/midi.c                                   |  2 +-
 tools/sched_ext/scx_qmap.bpf.c                     |  4 ++--
 698 files changed, 925 insertions(+), 925 deletions(-)
arch/alpha/kernel/srmcons.c +1 -1
index a89ce84371f9..3ea472b698cd 100644
@@ -69,7 +69,7 @@ srmcons_do_receive_chars(struct tty_port *port)
 static void
 srmcons_receive_chars(struct timer_list *t)
 {
-	struct srmcons_private *srmconsp = from_timer(srmconsp, t, timer);
+	struct srmcons_private *srmconsp = timer_container_of(srmconsp, t, timer);
 	struct tty_port *port = &srmconsp->port;
 	unsigned long flags;
 	int incr = 10;
arch/powerpc/kvm/booke.c +1 -1
index 6a4805968966..e56f78b4760a 100644
@@ -628,7 +628,7 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu)
 
 static void kvmppc_watchdog_func(struct timer_list *t)
 {
-	struct kvm_vcpu *vcpu = from_timer(vcpu, t, arch.wdt_timer);
+	struct kvm_vcpu *vcpu = timer_container_of(vcpu, t, arch.wdt_timer);
 	u32 tsr, new_tsr;
 	int final;
 
arch/powerpc/platforms/powermac/low_i2c.c +1 -1
index a0ae58636e10..4fda05aa83ba 100644
@@ -359,7 +359,7 @@ static irqreturn_t kw_i2c_irq(int irq, void *dev_id)
 
 static void kw_i2c_timeout(struct timer_list *t)
 {
-	struct pmac_i2c_host_kw *host = from_timer(host, t, timeout_timer);
+	struct pmac_i2c_host_kw *host = timer_container_of(host, t, timeout_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&host->lock, flags);
arch/sh/drivers/heartbeat.c +1 -1
index 24391b444b28..42103038a7d0 100644
@@ -58,7 +58,7 @@ static inline void heartbeat_toggle_bit(struct heartbeat_data *hd,
 
 static void heartbeat_timer(struct timer_list *t)
 {
-	struct heartbeat_data *hd = from_timer(hd, t, timer);
+	struct heartbeat_data *hd = timer_container_of(hd, t, timer);
 	static unsigned bit = 0, up = 1;
 
 	heartbeat_toggle_bit(hd, bit, hd->flags & HEARTBEAT_INVERTED);
arch/sh/drivers/pci/common.c +2 -2
index 5442475d132e..9633b6147a05 100644
@@ -88,7 +88,7 @@ int __init pci_is_66mhz_capable(struct pci_channel *hose,
 
 static void pcibios_enable_err(struct timer_list *t)
 {
-	struct pci_channel *hose = from_timer(hose, t, err_timer);
+	struct pci_channel *hose = timer_container_of(hose, t, err_timer);
 
 	timer_delete(&hose->err_timer);
 	printk(KERN_DEBUG "PCI: re-enabling error IRQ.\n");
@@ -97,7 +97,7 @@ static void pcibios_enable_err(struct timer_list *t)
 
 static void pcibios_enable_serr(struct timer_list *t)
 {
-	struct pci_channel *hose = from_timer(hose, t, serr_timer);
+	struct pci_channel *hose = timer_container_of(hose, t, serr_timer);
 
 	timer_delete(&hose->serr_timer);
 	printk(KERN_DEBUG "PCI: re-enabling system error IRQ.\n");
arch/sh/drivers/push-switch.c +1 -1
index 2b51ad9d5586..443cc6fd26a8 100644
@@ -25,7 +25,7 @@ static DEVICE_ATTR_RO(switch);
 
 static void switch_timer(struct timer_list *t)
 {
-	struct push_switch *psw = from_timer(psw, t, debounce);
+	struct push_switch *psw = timer_container_of(psw, t, debounce);
 
 	schedule_work(&psw->work);
 }
arch/sparc/kernel/viohs.c +1 -1
index e27afd233bf5..8fb2e7ca5015 100644
@@ -804,7 +804,7 @@ EXPORT_SYMBOL(vio_port_up);
 
 static void vio_port_timer(struct timer_list *t)
 {
-	struct vio_driver_state *vio = from_timer(vio, t, timer);
+	struct vio_driver_state *vio = timer_container_of(vio, t, timer);
 
 	vio_port_up(vio);
 }
arch/um/drivers/vector_kern.c +1 -1
index b97bb52dd562..570a14f9f995 100644
@@ -1533,7 +1533,7 @@ static const struct net_device_ops vector_netdev_ops = {
 
 static void vector_timer_expire(struct timer_list *t)
 {
-	struct vector_private *vp = from_timer(vp, t, tl);
+	struct vector_private *vp = timer_container_of(vp, t, tl);
 
 	vp->estats.tx_kicks++;
 	napi_schedule(&vp->napi);
arch/x86/kvm/xen.c +1 -1
index 38b33cdd4232..a1c9559944a3 100644
@@ -1571,7 +1571,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode,
 
 static void cancel_evtchn_poll(struct timer_list *t)
 {
-	struct kvm_vcpu *vcpu = from_timer(vcpu, t, arch.xen.poll_timer);
+	struct kvm_vcpu *vcpu = timer_container_of(vcpu, t, arch.xen.poll_timer);
 
 	kvm_make_request(KVM_REQ_UNBLOCK, vcpu);
 	kvm_vcpu_kick(vcpu);
arch/xtensa/platforms/iss/network.c +1 -1
index c6d8c62695e1..f0a63b2f85cc 100644
@@ -338,7 +338,7 @@ static int iss_net_poll(struct iss_net_private *lp)
 
 static void iss_net_timer(struct timer_list *t)
 {
-	struct iss_net_private *lp = from_timer(lp, t, timer);
+	struct iss_net_private *lp = timer_container_of(lp, t, timer);
 
 	iss_net_poll(lp);
 	mod_timer(&lp->timer, jiffies + lp->timer_val);
block/blk-core.c +1 -1
index e8cc270a453f..bec4cbce504d 100644
@@ -381,7 +381,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
 
 static void blk_rq_timed_out_timer(struct timer_list *t)
 {
-	struct request_queue *q = from_timer(q, t, timeout);
+	struct request_queue *q = timer_container_of(q, t, timeout);
 
 	kblockd_schedule_work(&q->timeout_work);
 }
block/blk-iolatency.c +1 -1
index 42c1e0b9a68f..61d183028a5c 100644
@@ -658,7 +658,7 @@ static const struct rq_qos_ops blkcg_iolatency_ops = {
 
 static void blkiolatency_timer_fn(struct timer_list *t)
 {
-	struct blk_iolatency *blkiolat = from_timer(blkiolat, t, timer);
+	struct blk_iolatency *blkiolat = timer_container_of(blkiolat, t, timer);
 	struct blkcg_gq *blkg;
 	struct cgroup_subsys_state *pos_css;
 	u64 now = blk_time_get_ns();
block/blk-stat.c +1 -1
index 46449da856f8..682a8ddb1173 100644
@@ -76,7 +76,7 @@ void blk_stat_add(struct request *rq, u64 now)
 
 static void blk_stat_timer_fn(struct timer_list *t)
 {
-	struct blk_stat_callback *cb = from_timer(cb, t, timer);
+	struct blk_stat_callback *cb = timer_container_of(cb, t, timer);
 	unsigned int bucket;
 	int cpu;
 
block/blk-throttle.c +1 -1
index d6dd2e047874..13c5943b535e 100644
@@ -1013,7 +1013,7 @@ static int throtl_select_dispatch(struct throtl_service_queue *parent_sq)
  */
 static void throtl_pending_timer_fn(struct timer_list *t)
 {
-	struct throtl_service_queue *sq = from_timer(sq, t, pending_timer);
+	struct throtl_service_queue *sq = timer_container_of(sq, t, pending_timer);
 	struct throtl_grp *tg = sq_to_tg(sq);
 	struct throtl_data *td = sq_to_td(sq);
 	struct throtl_service_queue *parent_sq;
block/kyber-iosched.c +1 -1
index 0f0f8452609a..4dba8405bd01 100644
@@ -276,7 +276,7 @@ static void kyber_resize_domain(struct kyber_queue_data *kqd,
 
 static void kyber_timer_fn(struct timer_list *t)
 {
-	struct kyber_queue_data *kqd = from_timer(kqd, t, timer);
+	struct kyber_queue_data *kqd = timer_container_of(kqd, t, timer);
 	unsigned int sched_domain;
 	int cpu;
 	bool bad = false;
drivers/accel/qaic/qaic_timesync.c +1 -1
index 972833fabcfc..3fac540f8e03 100644
@@ -129,7 +129,7 @@ static void qaic_timesync_dl_xfer_cb(struct mhi_device *mhi_dev, struct mhi_resu
 
 static void qaic_timesync_timer(struct timer_list *t)
 {
-	struct mqts_dev *mqtsdev = from_timer(mqtsdev, t, timer);
+	struct mqts_dev *mqtsdev = timer_container_of(mqtsdev, t, timer);
 	struct qts_host_time_sync_msg_data *sync_msg;
 	u64 device_qtimer_us;
 	u64 device_qtimer;
drivers/acpi/apei/ghes.c +1 -1
index 289e365f84b2..f5e6400bfbfb 100644
@@ -1138,7 +1138,7 @@ static void ghes_add_timer(struct ghes *ghes)
 
 static void ghes_poll_func(struct timer_list *t)
 {
-	struct ghes *ghes = from_timer(ghes, t, timer);
+	struct ghes *ghes = timer_container_of(ghes, t, timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&ghes_notify_lock_irq, flags);
drivers/ata/libahci.c +1 -1
index 22afa4ff860d..4e9c82f36df1 100644
@@ -1034,7 +1034,7 @@ static void ahci_sw_activity(struct ata_link *link)
 
 static void ahci_sw_activity_blink(struct timer_list *t)
 {
-	struct ahci_em_priv *emp = from_timer(emp, t, timer);
+	struct ahci_em_priv *emp = timer_container_of(emp, t, timer);
 	struct ata_link *link = emp->link;
 	struct ata_port *ap = link->ap;
 
drivers/ata/libata-eh.c +1 -1
index b990c1ee0b12..883d33db7972 100644
@@ -860,7 +860,7 @@ static unsigned int ata_eh_nr_in_flight(struct ata_port *ap)
 
 void ata_eh_fastdrain_timerfn(struct timer_list *t)
 {
-	struct ata_port *ap = from_timer(ap, t, fastdrain_timer);
+	struct ata_port *ap = timer_container_of(ap, t, fastdrain_timer);
 	unsigned long flags;
 	unsigned int cnt;
 
drivers/atm/idt77252.c +2 -2
index a876024d8a05..1206ab764ba9 100644
@@ -1531,7 +1531,7 @@ idt77252_tx(struct idt77252_dev *card)
 static void
 tst_timer(struct timer_list *t)
 {
-	struct idt77252_dev *card = from_timer(card, t, tst_timer);
+	struct idt77252_dev *card = timer_container_of(card, t, tst_timer);
 	unsigned long base, idle, jump;
 	unsigned long flags;
 	u32 pc;
@@ -2070,7 +2070,7 @@ idt77252_rate_logindex(struct idt77252_dev *card, int pcr)
 static void
 idt77252_est_timer(struct timer_list *t)
 {
-	struct rate_estimator *est = from_timer(est, t, timer);
+	struct rate_estimator *est = timer_container_of(est, t, timer);
 	struct vc_map *vc = est->vc;
 	struct idt77252_dev *card = vc->card;
 	unsigned long flags;
drivers/atm/lanai.c +1 -1
index 00fe25b5b6a3..2a1fe3080712 100644
@@ -1758,7 +1758,7 @@ static void iter_dequeue(struct lanai_dev *lanai, vci_t vci)
 
 static void lanai_timed_poll(struct timer_list *t)
 {
-	struct lanai_dev *lanai = from_timer(lanai, t, timer);
+	struct lanai_dev *lanai = timer_container_of(lanai, t, timer);
 #ifndef DEBUG_RW
 	unsigned long flags;
 #ifdef USE_POWERDOWN
drivers/auxdisplay/line-display.c +1 -1
index b6808c4f89b6..8590a4cd21e0 100644
@@ -40,7 +40,7 @@
  */
 static void linedisp_scroll(struct timer_list *t)
 {
-	struct linedisp *linedisp = from_timer(linedisp, t, timer);
+	struct linedisp *linedisp = timer_container_of(linedisp, t, timer);
 	unsigned int i, ch = linedisp->scroll_pos;
 	unsigned int num_chars = linedisp->num_chars;
 
drivers/base/power/main.c +1 -1
index c8b0a9e29ed8..318d4a4efbea 100644
@@ -512,7 +512,7 @@ struct dpm_watchdog {
  */
 static void dpm_watchdog_handler(struct timer_list *t)
 {
-	struct dpm_watchdog *wd = from_timer(wd, t, timer);
+	struct dpm_watchdog *wd = timer_container_of(wd, t, timer);
 	struct timer_list *timer = &wd->timer;
 	unsigned int time_left;
 
drivers/base/power/wakeup.c +1 -1
index 63bf914a4d44..e6306e1996eb 100644
@@ -763,7 +763,7 @@ EXPORT_SYMBOL_GPL(pm_relax);
  */
 static void pm_wakeup_timer_fn(struct timer_list *t)
 {
-	struct wakeup_source *ws = from_timer(ws, t, timer);
+	struct wakeup_source *ws = timer_container_of(ws, t, timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&ws->lock, flags);
drivers/block/aoe/aoecmd.c +1 -1
index 92b06d1de4cc..50cc90f6ab35 100644
@@ -745,7 +745,7 @@ rexmit_timer(struct timer_list *timer)
 	int utgts;	/* number of aoetgt descriptors (not slots) */
 	int since;
 
-	d = from_timer(d, timer, timer);
+	d = timer_container_of(d, timer, timer);
 
 	spin_lock_irqsave(&d->lock, flags);
 
drivers/block/aoe/aoedev.c +1 -1
index 141b2a0e03f2..bba05f0c5bbd 100644
@@ -149,7 +149,7 @@ dummy_timer(struct timer_list *t)
 {
 	struct aoedev *d;
 
-	d = from_timer(d, t, timer);
+	d = timer_container_of(d, t, timer);
 	if (d->flags & DEVFL_TKILL)
 		return;
 	d->timer.expires = jiffies + HZ;
drivers/block/drbd/drbd_main.c +1 -1
index ced2cc5f46f2..64f301f1cc63 100644
@@ -3591,7 +3591,7 @@ int drbd_md_test_flag(struct drbd_backing_dev *bdev, int flag)
 
 static void md_sync_timer_fn(struct timer_list *t)
 {
-	struct drbd_device *device = from_timer(device, t, md_sync_timer);
+	struct drbd_device *device = timer_container_of(device, t, md_sync_timer);
 	drbd_device_post_work(device, MD_SYNC);
 }
 
drivers/block/drbd/drbd_req.c +1 -1
index 380e6584a4ee..915cbb2e4cca 100644
@@ -1699,7 +1699,7 @@ static bool net_timeout_reached(struct drbd_request *net_req,
 
 void request_timer_fn(struct timer_list *t)
 {
-	struct drbd_device *device = from_timer(device, t, request_timer);
+	struct drbd_device *device = timer_container_of(device, t, request_timer);
 	struct drbd_connection *connection = first_peer_device(device)->connection;
 	struct drbd_request *req_read, *req_write, *req_peer; /* oldest request */
 	struct net_conf *nc;
drivers/block/drbd/drbd_worker.c +2 -2
index 4352a50fbb3f..50ee616c6c5d 100644
@@ -442,7 +442,7 @@ int w_resync_timer(struct drbd_work *w, int cancel)
 
 void resync_timer_fn(struct timer_list *t)
 {
-	struct drbd_device *device = from_timer(device, t, resync_timer);
+	struct drbd_device *device = timer_container_of(device, t, resync_timer);
 
 	drbd_queue_work_if_unqueued(
 		&first_peer_device(device)->connection->sender_work,
@@ -1698,7 +1698,7 @@ void drbd_rs_controller_reset(struct drbd_peer_device *peer_device)
 
 void start_resync_timer_fn(struct timer_list *t)
 {
-	struct drbd_device *device = from_timer(device, t, start_resync_timer);
+	struct drbd_device *device = timer_container_of(device, t, start_resync_timer);
 	drbd_device_post_work(device, RS_START);
 }
 
drivers/block/swim3.c +4 -4
index ee6cade70222..01f7aef3fcfb 100644
@@ -555,7 +555,7 @@ static void act(struct floppy_state *fs)
 
 static void scan_timeout(struct timer_list *t)
 {
-	struct floppy_state *fs = from_timer(fs, t, timeout);
+	struct floppy_state *fs = timer_container_of(fs, t, timeout);
 	struct swim3 __iomem *sw = fs->swim3;
 	unsigned long flags;
 
@@ -579,7 +579,7 @@ static void scan_timeout(struct timer_list *t)
 
 static void seek_timeout(struct timer_list *t)
 {
-	struct floppy_state *fs = from_timer(fs, t, timeout);
+	struct floppy_state *fs = timer_container_of(fs, t, timeout);
 	struct swim3 __iomem *sw = fs->swim3;
 	unsigned long flags;
 
@@ -598,7 +598,7 @@ static void seek_timeout(struct timer_list *t)
 
 static void settle_timeout(struct timer_list *t)
 {
-	struct floppy_state *fs = from_timer(fs, t, timeout);
+	struct floppy_state *fs = timer_container_of(fs, t, timeout);
 	struct swim3 __iomem *sw = fs->swim3;
 	unsigned long flags;
 
@@ -627,7 +627,7 @@ static void settle_timeout(struct timer_list *t)
 
 static void xfer_timeout(struct timer_list *t)
 {
-	struct floppy_state *fs = from_timer(fs, t, timeout);
+	struct floppy_state *fs = timer_container_of(fs, t, timeout);
 	struct swim3 __iomem *sw = fs->swim3;
 	struct dbdma_regs __iomem *dr = fs->dma;
 	unsigned long flags;
drivers/bluetooth/bluecard_cs.c +1 -1
index 1c7f89e134b3..1e3a56e9b139 100644
@@ -158,7 +158,7 @@ static void bluecard_detach(struct pcmcia_device *p_dev);
 
 static void bluecard_activity_led_timeout(struct timer_list *t)
 {
-	struct bluecard_info *info = from_timer(info, t, timer);
+	struct bluecard_info *info = timer_container_of(info, t, timer);
 	unsigned int iobase = info->p_dev->resource[0]->start;
 
 	if (test_bit(CARD_ACTIVITY, &(info->hw_state))) {
drivers/bluetooth/btnxpuart.c +1 -1
index 5091dea762a0..e35ac3e83828 100644
@@ -464,7 +464,7 @@ static void ps_work_func(struct work_struct *work)
 
 static void ps_timeout_func(struct timer_list *t)
 {
-	struct ps_data *data = from_timer(data, t, ps_timer);
+	struct ps_data *data = timer_container_of(data, t, ps_timer);
 	struct hci_dev *hdev = data->hdev;
 	struct btnxpuart_dev *nxpdev = hci_get_drvdata(hdev);
 
drivers/bluetooth/hci_bcsp.c +1 -1
index 610d0e3c36d4..664d82d1e613 100644
@@ -688,7 +688,7 @@ static int bcsp_recv(struct hci_uart *hu, const void *data, int count)
 	/* Arrange to retransmit all messages in the relq. */
 static void bcsp_timed_event(struct timer_list *t)
 {
-	struct bcsp_struct *bcsp = from_timer(bcsp, t, tbcsp);
+	struct bcsp_struct *bcsp = timer_container_of(bcsp, t, tbcsp);
 	struct hci_uart *hu = bcsp->hu;
 	struct sk_buff *skb;
 	unsigned long flags;
drivers/bluetooth/hci_h5.c +1 -1
index edafa228bf83..d0d4420c1a0f 100644
@@ -149,7 +149,7 @@ static void h5_timed_event(struct timer_list *t)
 {
 	const unsigned char sync_req[] = { 0x01, 0x7e };
 	unsigned char conf_req[3] = { 0x03, 0xfc };
-	struct h5 *h5 = from_timer(h5, t, timer);
+	struct h5 *h5 = timer_container_of(h5, t, timer);
 	struct hci_uart *hu = h5->hu;
 	struct sk_buff *skb;
 	unsigned long flags;
drivers/bluetooth/hci_qca.c +2 -2
index e00590ba24fd..0a4c84536640 100644
@@ -474,7 +474,7 @@ static void qca_wq_serial_tx_clock_vote_off(struct work_struct *work)
 
 static void hci_ibs_tx_idle_timeout(struct timer_list *t)
 {
-	struct qca_data *qca = from_timer(qca, t, tx_idle_timer);
+	struct qca_data *qca = timer_container_of(qca, t, tx_idle_timer);
 	struct hci_uart *hu = qca->hu;
 	unsigned long flags;
 
@@ -507,7 +507,7 @@ static void hci_ibs_tx_idle_timeout(struct timer_list *t)
 
 static void hci_ibs_wake_retrans_timeout(struct timer_list *t)
 {
-	struct qca_data *qca = from_timer(qca, t, wake_retrans_timer);
+	struct qca_data *qca = timer_container_of(qca, t, wake_retrans_timer);
 	struct hci_uart *hu = qca->hu;
 	unsigned long flags, retrans_delay;
 	bool retransmit = false;
drivers/bus/mhi/host/pci_generic.c +1 -1
index 03aa88795209..663c9aa83c21 100644
@@ -1136,7 +1136,7 @@ static void mhi_pci_recovery_work(struct work_struct *work)
 
 static void health_check(struct timer_list *t)
 {
-	struct mhi_pci_device *mhi_pdev = from_timer(mhi_pdev, t, health_check_timer);
+	struct mhi_pci_device *mhi_pdev = timer_container_of(mhi_pdev, t, health_check_timer);
 	struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl;
 
 	if (!test_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status) ||
drivers/char/hw_random/xgene-rng.c +1 -1
index a1a751074f7e..709a36507145 100644
@@ -88,7 +88,7 @@ struct xgene_rng_dev {
 
 static void xgene_rng_expired_timer(struct timer_list *t)
 {
-	struct xgene_rng_dev *ctx = from_timer(ctx, t, failure_timer);
+	struct xgene_rng_dev *ctx = timer_container_of(ctx, t, failure_timer);
 
 	/* Clear failure counter as timer expired */
 	disable_irq(ctx->irq);
drivers/char/ipmi/bt-bmc.c +1 -1
index 77146b5c762b..a179d4797011 100644
@@ -347,7 +347,7 @@ static const struct file_operations bt_bmc_fops = {
 
 static void poll_timer(struct timer_list *t)
 {
-	struct bt_bmc *bt_bmc = from_timer(bt_bmc, t, poll_timer);
+	struct bt_bmc *bt_bmc = timer_container_of(bt_bmc, t, poll_timer);
 
 	bt_bmc->poll_timer.expires += msecs_to_jiffies(500);
 	wake_up(&bt_bmc->queue);
drivers/char/ipmi/ipmi_si_intf.c +1 -1
index 12b0b77eb1cc..548effc12b2b 100644
@@ -1072,7 +1072,7 @@ static void set_need_watch(void *send_info, unsigned int watch_mask)
 
 static void smi_timeout(struct timer_list *t)
 {
-	struct smi_info   *smi_info = from_timer(smi_info, t, si_timer);
+	struct smi_info   *smi_info = timer_container_of(smi_info, t, si_timer);
 	enum si_sm_result smi_result;
 	unsigned long     flags;
 	unsigned long     jiffies_now;
drivers/char/ipmi/ipmi_ssif.c +2 -2
index 0b45b07dec22..fa726e620e55 100644
@@ -541,7 +541,7 @@ static void start_resend(struct ssif_info *ssif_info);
 
 static void retry_timeout(struct timer_list *t)
 {
-	struct ssif_info *ssif_info = from_timer(ssif_info, t, retry_timer);
+	struct ssif_info *ssif_info = timer_container_of(ssif_info, t, retry_timer);
 	unsigned long oflags, *flags;
 	bool waiting, resend;
 
@@ -565,7 +565,7 @@ static void retry_timeout(struct timer_list *t)
 
 static void watch_timeout(struct timer_list *t)
 {
-	struct ssif_info *ssif_info = from_timer(ssif_info, t, watch_timer);
+	struct ssif_info *ssif_info = timer_container_of(ssif_info, t, watch_timer);
 	unsigned long oflags, *flags;
 
 	if (ssif_info->stopping)
drivers/char/ipmi/ssif_bmc.c +1 -1
index e4bd74585d4d..b7654efcf2c3 100644
@@ -297,7 +297,7 @@ static void complete_response(struct ssif_bmc_ctx *ssif_bmc)
 
 static void response_timeout(struct timer_list *t)
 {
-	struct ssif_bmc_ctx *ssif_bmc = from_timer(ssif_bmc, t, response_timer);
+	struct ssif_bmc_ctx *ssif_bmc = timer_container_of(ssif_bmc, t, response_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&ssif_bmc->lock, flags);
drivers/char/tpm/tpm-dev-common.c +1 -1
index 11deaf538e87..f2a5e09257dd 100644
@@ -91,7 +91,7 @@ static void tpm_dev_async_work(struct work_struct *work)
 
 static void user_reader_timeout(struct timer_list *t)
 {
-	struct file_priv *priv = from_timer(priv, t, user_read_timer);
+	struct file_priv *priv = timer_container_of(priv, t, user_read_timer);
 
 	pr_warn("TPM user space timeout is deprecated (pid=%d)\n",
 		task_tgid_nr(current));
drivers/comedi/drivers/comedi_test.c +2 -2
index da17d891f0e5..71124b694bf3 100644
@@ -197,7 +197,7 @@ static unsigned short fake_waveform(struct comedi_device *dev,
  */
 static void waveform_ai_timer(struct timer_list *t)
 {
-	struct waveform_private *devpriv = from_timer(devpriv, t, ai_timer);
+	struct waveform_private *devpriv = timer_container_of(devpriv, t, ai_timer);
 	struct comedi_device *dev = devpriv->dev;
 	struct comedi_subdevice *s = dev->read_subdev;
 	struct comedi_async *async = s->async;
@@ -444,7 +444,7 @@ static int waveform_ai_insn_read(struct comedi_device *dev,
  */
 static void waveform_ao_timer(struct timer_list *t)
 {
-	struct waveform_private *devpriv = from_timer(devpriv, t, ao_timer);
+	struct waveform_private *devpriv = timer_container_of(devpriv, t, ao_timer);
 	struct comedi_device *dev = devpriv->dev;
 	struct comedi_subdevice *s = dev->write_subdev;
 	struct comedi_async *async = s->async;
drivers/comedi/drivers/das16.c +1 -1
index f5ca6c0d4d0c..a2588b35e156 100644
@@ -517,7 +517,7 @@ static void das16_interrupt(struct comedi_device *dev)
 
 static void das16_timer_interrupt(struct timer_list *t)
 {
-	struct das16_private_struct *devpriv = from_timer(devpriv, t, timer);
+	struct das16_private_struct *devpriv = timer_container_of(devpriv, t, timer);
 	struct comedi_device *dev = devpriv->dev;
 	unsigned long flags;
 
drivers/comedi/drivers/jr3_pci.c +1 -1
index cdc842b32bab..18a23d6625f6 100644
@@ -562,7 +562,7 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s)
 
 static void jr3_pci_poll_dev(struct timer_list *t)
 {
-	struct jr3_pci_dev_private *devpriv = from_timer(devpriv, t, timer);
+	struct jr3_pci_dev_private *devpriv = timer_container_of(devpriv, t, timer);
 	struct comedi_device *dev = devpriv->dev;
 	struct jr3_pci_subdev_private *spriv;
 	struct comedi_subdevice *s;
drivers/cpufreq/powernv-cpufreq.c +1 -1
index afe5abf89d33..1de7226db377 100644
@@ -667,7 +667,7 @@ static inline void  queue_gpstate_timer(struct global_pstate_info *gpstates)
  */
 static void gpstate_timer_handler(struct timer_list *t)
 {
-	struct global_pstate_info *gpstates = from_timer(gpstates, t, timer);
+	struct global_pstate_info *gpstates = timer_container_of(gpstates, t, timer);
 	struct cpufreq_policy *policy = gpstates->policy;
 	int gpstate_idx, lpstate_idx;
 	unsigned long val;
drivers/crypto/axis/artpec6_crypto.c +1 -1
index f8d50bd227a6..75ee065da1ec 100644
@@ -2072,7 +2072,7 @@ static void artpec6_crypto_process_queue(struct artpec6_crypto *ac,
 
 static void artpec6_crypto_timeout(struct timer_list *t)
 {
-	struct artpec6_crypto *ac = from_timer(ac, t, timer);
+	struct artpec6_crypto *ac = timer_container_of(ac, t, timer);
 
 	dev_info_ratelimited(artpec6_crypto_dev, "timeout\n");
 
drivers/dma-buf/st-dma-fence.c +1 -1
index 9f80a45498f0..50b3d28eff47 100644
@@ -375,7 +375,7 @@ struct wait_timer {
 
 static void wait_timer(struct timer_list *timer)
 {
-	struct wait_timer *wt = from_timer(wt, timer, timer);
+	struct wait_timer *wt = timer_container_of(wt, timer, timer);
 
 	dma_fence_signal(wt->f);
 }
drivers/dma/imx-dma.c +1 -1
index b96cc0a83872..d4a7e8eaf901 100644
@@ -337,7 +337,7 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac)
 
 static void imxdma_watchdog(struct timer_list *t)
 {
-	struct imxdma_channel *imxdmac = from_timer(imxdmac, t, watchdog);
+	struct imxdma_channel *imxdmac = timer_container_of(imxdmac, t, watchdog);
 	struct imxdma_engine *imxdma = imxdmac->imxdma;
 	int channel = imxdmac->channel;
 
drivers/dma/ioat/dma.c +1 -1
index 06a813cc7641..d29f1b55ba8b 100644
@@ -901,7 +901,7 @@ static void ioat_reboot_chan(struct ioatdma_chan *ioat_chan)
 
 void ioat_timer_event(struct timer_list *t)
 {
-	struct ioatdma_chan *ioat_chan = from_timer(ioat_chan, t, timer);
+	struct ioatdma_chan *ioat_chan = timer_container_of(ioat_chan, t, timer);
 	dma_addr_t phys_complete;
 	u64 status;
 
drivers/firewire/core-transaction.c +1 -1
index b0f9ef6ac6df..ea2ad71c1a5d 100644
@@ -114,7 +114,7 @@ EXPORT_SYMBOL(fw_cancel_transaction);
 
 static void split_transaction_timeout_callback(struct timer_list *timer)
 {
-	struct fw_transaction *t = from_timer(t, timer, split_timeout_timer);
+	struct fw_transaction *t = timer_container_of(t, timer, split_timeout_timer);
 	struct fw_card *card = t->card;
 
 	scoped_guard(spinlock_irqsave, &card->lock) {
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1 -1
index 5f5c00ace96b..44f5319166bf 100644
@@ -322,7 +322,7 @@ bool amdgpu_fence_process(struct amdgpu_ring *ring)
  */
 static void amdgpu_fence_fallback(struct timer_list *t)
 {
-	struct amdgpu_ring *ring = from_timer(ring, t,
+	struct amdgpu_ring *ring = timer_container_of(ring, t,
 					      fence_drv.fallback_timer);
 
 	if (amdgpu_fence_process(ring))
drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c +1 -1
index 03ed14663107..f847d18f3b4a 100644
@@ -135,7 +135,7 @@ static void amdgpu_ring_mux_schedule_resubmit(struct amdgpu_ring_mux *mux)
 
 static void amdgpu_mux_resubmit_fallback(struct timer_list *t)
 {
-	struct amdgpu_ring_mux *mux = from_timer(mux, t, resubmit_timer);
+	struct amdgpu_ring_mux *mux = timer_container_of(mux, t, resubmit_timer);
 
 	if (!spin_trylock(&mux->lock)) {
 		amdgpu_ring_mux_schedule_resubmit(mux);
drivers/gpu/drm/bridge/tda998x_drv.c +1 -1
index 20658258fb51..28a4e843e425 100644
@@ -751,7 +751,7 @@ tda998x_reset(struct tda998x_priv *priv)
  */
 static void tda998x_edid_delay_done(struct timer_list *t)
 {
-	struct tda998x_priv *priv = from_timer(priv, t, edid_delay_timer);
+	struct tda998x_priv *priv = timer_container_of(priv, t, edid_delay_timer);
 
 	priv->edid_delay_active = false;
 	wake_up(&priv->edid_delay_waitq);
drivers/gpu/drm/drm_vblank.c +1 -1
index 78958ddf8485..dac121faa2e0 100644
@@ -487,7 +487,7 @@ void drm_vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
 
 static void vblank_disable_fn(struct timer_list *t)
 {
-	struct drm_vblank_crtc *vblank = from_timer(vblank, t, disable_timer);
+	struct drm_vblank_crtc *vblank = timer_container_of(vblank, t, disable_timer);
 	struct drm_device *dev = vblank->dev;
 	unsigned int pipe = vblank->pipe;
 	unsigned long irqflags;
drivers/gpu/drm/exynos/exynos_drm_vidi.c +1 -1
index 08cf79a62025..a6c88eea4ef6 100644
@@ -159,7 +159,7 @@ static const struct exynos_drm_crtc_ops vidi_crtc_ops = {
 
 static void vidi_fake_vblank_timer(struct timer_list *t)
 {
-	struct vidi_context *ctx = from_timer(ctx, t, timer);
+	struct vidi_context *ctx = timer_container_of(ctx, t, timer);
 
 	if (drm_crtc_handle_vblank(&ctx->crtc->base))
 		mod_timer(&ctx->timer,
drivers/gpu/drm/gud/gud_pipe.c +1 -1
index 77cfcf37ddd2..6982cb13de12 100644
@@ -234,7 +234,7 @@ struct gud_usb_bulk_context {
 
 static void gud_usb_bulk_timeout(struct timer_list *t)
 {
-	struct gud_usb_bulk_context *ctx = from_timer(ctx, t, timer);
+	struct gud_usb_bulk_context *ctx = timer_container_of(ctx, t, timer);
 
 	usb_sg_cancel(&ctx->sgr);
 }
drivers/gpu/drm/i915/gt/intel_rps.c +1 -1
index 64e9317f58fb..f8226a11dd7c 100644
@@ -74,7 +74,7 @@ static void set(struct intel_uncore *uncore, i915_reg_t reg, u32 val)
 
 static void rps_timer(struct timer_list *t)
 {
-	struct intel_rps *rps = from_timer(rps, t, timer);
+	struct intel_rps *rps = timer_container_of(rps, t, timer);
 	struct intel_gt *gt = rps_to_gt(rps);
 	struct intel_engine_cs *engine;
 	ktime_t dt, last, timestamp;
drivers/gpu/drm/i915/gt/mock_engine.c +1 -1
index 64315b714743..79741f043f03 100644
@@ -108,7 +108,7 @@ static void advance(struct i915_request *request)
 
 static void hw_delay_complete(struct timer_list *t)
 {
-	struct mock_engine *engine = from_timer(engine, t, hw_delay);
+	struct mock_engine *engine = timer_container_of(engine, t, hw_delay);
 	struct i915_request *request;
 	unsigned long flags;
 
drivers/gpu/drm/i915/gt/selftest_migrate.c +1 -1
index 401bee030dbc..0f6589260e33 100644
@@ -537,7 +537,7 @@ struct spinner_timer {
 
 static void spinner_kill(struct timer_list *timer)
 {
-	struct spinner_timer *st = from_timer(st, timer, timer);
+	struct spinner_timer *st = timer_container_of(st, timer, timer);
 
 	igt_spinner_end(&st->spin);
 	pr_info("%s\n", __func__);
drivers/gpu/drm/i915/i915_sw_fence.c +1 -1
index 1d4cc91c0e40..dadc7641e574 100644
@@ -427,7 +427,7 @@ static void dma_i915_sw_fence_wake(struct dma_fence *dma,
 
 static void timer_i915_sw_fence_wake(struct timer_list *t)
 {
-	struct i915_sw_dma_fence_cb_timer *cb = from_timer(cb, t, timer);
+	struct i915_sw_dma_fence_cb_timer *cb = timer_container_of(cb, t, timer);
 	struct i915_sw_fence *fence;
 
 	fence = xchg(&cb->base.fence, NULL);
drivers/gpu/drm/i915/intel_wakeref.c +1 -1
index 07e81be4d392..51561b190b93 100644
@@ -135,7 +135,7 @@ int intel_wakeref_wait_for_idle(struct intel_wakeref *wf)
 
 static void wakeref_auto_timeout(struct timer_list *t)
 {
-	struct intel_wakeref_auto *wf = from_timer(wf, t, timer);
+	struct intel_wakeref_auto *wf = timer_container_of(wf, t, timer);
 	intel_wakeref_t wakeref;
 	unsigned long flags;
 
drivers/gpu/drm/i915/selftests/lib_sw_fence.c +1 -1
index d5ecc68155da..47703716c9f2 100644
@@ -55,7 +55,7 @@ void onstack_fence_fini(struct i915_sw_fence *fence)
 
 static void timed_fence_wake(struct timer_list *t)
 {
-	struct timed_fence *tf = from_timer(tf, t, timer);
+	struct timed_fence *tf = timer_container_of(tf, t, timer);
 
 	i915_sw_fence_commit(&tf->fence);
 }
drivers/gpu/drm/mediatek/mtk_dp.c +1 -1
index fed3307d3374..9b3b27b4d480 100644
@@ -2568,7 +2568,7 @@ static const struct drm_bridge_funcs mtk_dp_bridge_funcs = {
 
 static void mtk_dp_debounce_timer(struct timer_list *t)
 {
-	struct mtk_dp *mtk_dp = from_timer(mtk_dp, t, debounce_timer);
+	struct mtk_dp *mtk_dp = timer_container_of(mtk_dp, t, debounce_timer);
 
 	mtk_dp->need_debounce = true;
 }
drivers/gpu/drm/msm/adreno/a5xx_preempt.c +1 -1
index 36f72c43eae8..58a86c84e5a8 100644
@@ -79,7 +79,7 @@ static struct msm_ringbuffer *get_next_ring(struct msm_gpu *gpu)
 
 static void a5xx_preempt_timer(struct timer_list *t)
 {
-	struct a5xx_gpu *a5xx_gpu = from_timer(a5xx_gpu, t, preempt_timer);
+	struct a5xx_gpu *a5xx_gpu = timer_container_of(a5xx_gpu, t, preempt_timer);
 	struct msm_gpu *gpu = &a5xx_gpu->base.base;
 	struct drm_device *dev = gpu->dev;
 
drivers/gpu/drm/msm/adreno/a6xx_preempt.c +1 -1
index 9b5e27d2373c..502453dfcff2 100644
@@ -87,7 +87,7 @@ static struct msm_ringbuffer *get_next_ring(struct msm_gpu *gpu)
 
 static void a6xx_preempt_timer(struct timer_list *t)
 {
-	struct a6xx_gpu *a6xx_gpu = from_timer(a6xx_gpu, t, preempt_timer);
+	struct a6xx_gpu *a6xx_gpu = timer_container_of(a6xx_gpu, t, preempt_timer);
 	struct msm_gpu *gpu = &a6xx_gpu->base.base;
 	struct drm_device *dev = gpu->dev;
 
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -1
index 8610bbf2b87c..51844072bfed 100644
@@ -2684,7 +2684,7 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
 
 static void dpu_encoder_frame_done_timeout(struct timer_list *t)
 {
-	struct dpu_encoder_virt *dpu_enc = from_timer(dpu_enc, t,
+	struct dpu_encoder_virt *dpu_enc = timer_container_of(dpu_enc, t,
 			frame_done_timer);
 	struct drm_encoder *drm_enc = &dpu_enc->base;
 	u32 event;
drivers/gpu/drm/msm/msm_gpu.c +1 -1
index c380d9d9f5af..197871fdf508 100644
@@ -521,7 +521,7 @@ static bool made_progress(struct msm_gpu *gpu, struct msm_ringbuffer *ring)
 
 static void hangcheck_handler(struct timer_list *t)
 {
-	struct msm_gpu *gpu = from_timer(gpu, t, hangcheck_timer);
+	struct msm_gpu *gpu = timer_container_of(gpu, t, hangcheck_timer);
 	struct drm_device *dev = gpu->dev;
 	struct msm_ringbuffer *ring = gpu->funcs->active_ring(gpu);
 	uint32_t fence = ring->memptrs->fence;
drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1 -1
index f8f20d2f6174..3042d0f7a117 100644
@@ -175,7 +175,7 @@ struct signal_timer {
 
 static void signal_for_ttm_bo_reserve(struct timer_list *t)
 {
-	struct signal_timer *s_timer = from_timer(s_timer, t, timer);
+	struct signal_timer *s_timer = timer_container_of(s_timer, t, timer);
 	struct task_struct *task = s_timer->ctx->task;
 
 	do_send_sig_info(SIGTERM, SEND_SIG_PRIV, task, PIDTYPE_PID);
drivers/gpu/drm/vc4/vc4_bo.c +1 -1
index 7125773889f1..4aaa587be3a5 100644
@@ -679,7 +679,7 @@ void vc4_bo_dec_usecnt(struct vc4_bo *bo)
 
 static void vc4_bo_cache_time_timer(struct timer_list *t)
 {
-	struct vc4_dev *vc4 = from_timer(vc4, t, bo_cache.time_timer);
+	struct vc4_dev *vc4 = timer_container_of(vc4, t, bo_cache.time_timer);
 
 	schedule_work(&vc4->bo_cache.time_work);
 }
drivers/gpu/drm/vc4/vc4_gem.c +1 -1
index 8125f87edc60..255e5817618e 100644
@@ -326,7 +326,7 @@ vc4_reset_work(struct work_struct *work)
 static void
 vc4_hangcheck_elapsed(struct timer_list *t)
 {
-	struct vc4_dev *vc4 = from_timer(vc4, t, hangcheck.timer);
+	struct vc4_dev *vc4 = timer_container_of(vc4, t, hangcheck.timer);
 	struct drm_device *dev = &vc4->base;
 	uint32_t ct0ca, ct1ca;
 	unsigned long irqflags;
drivers/gpu/drm/vgem/vgem_fence.c +1 -1
index 37bb1fb58cf9..145ea549fc0a 100644
@@ -76,7 +76,7 @@ static const struct dma_fence_ops vgem_fence_ops = {
 
 static void vgem_fence_timeout(struct timer_list *t)
 {
-	struct vgem_fence *fence = from_timer(fence, t, timer);
+	struct vgem_fence *fence = timer_container_of(fence, t, timer);
 
 	dma_fence_signal(&fence->base);
 }
drivers/greybus/operation.c +1 -1
index f6beeebf974c..6d02ab77e32d 100644
@@ -295,7 +295,7 @@ static void gb_operation_work(struct work_struct *work)
 
 static void gb_operation_timeout(struct timer_list *t)
 {
-	struct gb_operation *operation = from_timer(operation, t, timer);
+	struct gb_operation *operation = timer_container_of(operation, t, timer);
 
 	if (gb_operation_result_set(operation, -ETIMEDOUT)) {
 		/*
drivers/hid/hid-apple.c +1 -1
index ed34f5cd5a91..0639b1f43d88 100644
@@ -614,7 +614,7 @@ static int apple_fetch_battery(struct hid_device *hdev)
 
 static void apple_battery_timer_tick(struct timer_list *t)
 {
-	struct apple_sc *asc = from_timer(asc, t, battery_timer);
+	struct apple_sc *asc = timer_container_of(asc, t, battery_timer);
 	struct hid_device *hdev = asc->hdev;
 
 	if (apple_fetch_battery(hdev) == 0) {
drivers/hid/hid-appleir.c +1 -1
index bb7db9ae41c2..5e8ced7bc05a 100644
@@ -167,7 +167,7 @@ static void battery_flat(struct appleir *appleir)
 
 static void key_up_tick(struct timer_list *t)
 {
-	struct appleir *appleir = from_timer(appleir, t, key_up_timer);
+	struct appleir *appleir = timer_container_of(appleir, t, key_up_timer);
 	struct hid_device *hid = appleir->hid;
 	unsigned long flags;
 
drivers/hid/hid-appletb-kbd.c +1 -1
index 029ccbaa1d12..b32776ceac0a 100644
@@ -166,7 +166,7 @@ static int appletb_tb_key_to_slot(unsigned int code)
 
 static void appletb_inactivity_timer(struct timer_list *t)
 {
-	struct appletb_kbd *kbd = from_timer(kbd, t, inactivity_timer);
+	struct appletb_kbd *kbd = timer_container_of(kbd, t, inactivity_timer);
 
 	if (kbd->backlight_dev && appletb_tb_autodim) {
 		if (!kbd->has_dimmed) {
drivers/hid/hid-letsketch.c +1 -1
index 8602c63ed9c6..4df42c5b6e88 100644
@@ -155,7 +155,7 @@ static int letsketch_setup_input_tablet_pad(struct letsketch_data *data)
 
 static void letsketch_inrange_timeout(struct timer_list *t)
 {
-	struct letsketch_data *data = from_timer(data, t, inrange_timer);
+	struct letsketch_data *data = timer_container_of(data, t, inrange_timer);
 	struct input_dev *input = data->input_tablet;
 
 	input_report_key(input, BTN_TOOL_PEN, 0);
drivers/hid/hid-magicmouse.c +1 -1
index adfa329e917b..4c6a0ef64e0d 100644
@@ -809,7 +809,7 @@ static int magicmouse_fetch_battery(struct hid_device *hdev)
 
 static void magicmouse_battery_timer_tick(struct timer_list *t)
 {
-	struct magicmouse_sc *msc = from_timer(msc, t, battery_timer);
+	struct magicmouse_sc *msc = timer_container_of(msc, t, battery_timer);
 	struct hid_device *hdev = msc->hdev;
 
 	if (magicmouse_fetch_battery(hdev) == 0) {
drivers/hid/hid-multitouch.c +1 -1
index 7ac8e16e6158..3d6dee383b6f 100644
@@ -1745,7 +1745,7 @@ static void mt_release_contacts(struct hid_device *hid)
 
 static void mt_expired_timeout(struct timer_list *t)
 {
-	struct mt_device *td = from_timer(td, t, release_timer);
+	struct mt_device *td = timer_container_of(td, t, release_timer);
 	struct hid_device *hdev = td->hdev;
 
 	/*
drivers/hid/hid-prodikeys.c +1 -1
index c6b922c2adba..74bddb2c3e82 100644
@@ -227,7 +227,7 @@ static void pcmidi_send_note(struct pcmidi_snd *pm,
 
 static void pcmidi_sustained_note_release(struct timer_list *t)
 {
-	struct pcmidi_sustain *pms = from_timer(pms, t, timer);
+	struct pcmidi_sustain *pms = timer_container_of(pms, t, timer);
 
 	pcmidi_send_note(pms->pm, pms->status, pms->note, pms->velocity);
 	pms->in_use = 0;
drivers/hid/hid-sony.c +1 -1
index a2be652b7bbd..b966e4044238 100644
@@ -545,7 +545,7 @@ static void ghl_magic_poke_cb(struct urb *urb)
 static void ghl_magic_poke(struct timer_list *t)
 {
 	int ret;
-	struct sony_sc *sc = from_timer(sc, t, ghl_poke_timer);
+	struct sony_sc *sc = timer_container_of(sc, t, ghl_poke_timer);
 
 	ret = usb_submit_urb(sc->ghl_urb, GFP_ATOMIC);
 	if (ret < 0)
drivers/hid/hid-uclogic-core.c +1 -1
index a367df6ea01f..435c52cecf69 100644
@@ -32,7 +32,7 @@
  */
 static void uclogic_inrange_timeout(struct timer_list *t)
 {
-	struct uclogic_drvdata *drvdata = from_timer(drvdata, t,
+	struct uclogic_drvdata *drvdata = timer_container_of(drvdata, t,
 							inrange_timer);
 	struct input_dev *input = drvdata->pen_input;
 
drivers/hid/hid-wiimote-core.c +1 -1
index 8080083121d3..5b5fc460a4c5 100644
@@ -1240,7 +1240,7 @@ static void wiimote_schedule(struct wiimote_data *wdata)
 
 static void wiimote_init_timeout(struct timer_list *t)
 {
-	struct wiimote_data *wdata = from_timer(wdata, t, timer);
+	struct wiimote_data *wdata = timer_container_of(wdata, t, timer);
 
 	wiimote_schedule(wdata);
 }
drivers/hid/usbhid/hid-core.c +1 -1
index 7d9297fad90e..be325495c132 100644
@@ -106,7 +106,7 @@ static int hid_start_in(struct hid_device *hid)
 /* I/O retry timer routine */
 static void hid_retry_timeout(struct timer_list *t)
 {
-	struct usbhid_device *usbhid = from_timer(usbhid, t, io_retry);
+	struct usbhid_device *usbhid = timer_container_of(usbhid, t, io_retry);
 	struct hid_device *hid = usbhid->hid;
 
 	dev_dbg(&usbhid->intf->dev, "retrying intr urb\n");
drivers/hid/wacom_wac.c +1 -1
index 5107a676e24f..955b39d22524 100644
@@ -63,7 +63,7 @@ static void wacom_force_proxout(struct wacom_wac *wacom_wac)
 
 void wacom_idleprox_timeout(struct timer_list *list)
 {
-	struct wacom *wacom = from_timer(wacom, list, idleprox_timer);
+	struct wacom *wacom = timer_container_of(wacom, list, idleprox_timer);
 	struct wacom_wac *wacom_wac = &wacom->wacom_wac;
 
 	if (!wacom_wac->hid_data.sense_state) {
drivers/hsi/clients/ssi_protocol.c +3 -3
index cbc5e72857de..d10a01f3eb9e 100644
@@ -453,7 +453,7 @@ static void ssip_error(struct hsi_client *cl)
 
 static void ssip_keep_alive(struct timer_list *t)
 {
-	struct ssi_protocol *ssi = from_timer(ssi, t, keep_alive);
+	struct ssi_protocol *ssi = timer_container_of(ssi, t, keep_alive);
 	struct hsi_client *cl = ssi->cl;
 
 	dev_dbg(&cl->device, "Keep alive kick in: m(%d) r(%d) s(%d)\n",
@@ -480,7 +480,7 @@ static void ssip_keep_alive(struct timer_list *t)
 
 static void ssip_rx_wd(struct timer_list *t)
 {
-	struct ssi_protocol *ssi = from_timer(ssi, t, rx_wd);
+	struct ssi_protocol *ssi = timer_container_of(ssi, t, rx_wd);
 	struct hsi_client *cl = ssi->cl;
 
 	dev_err(&cl->device, "Watchdog triggered\n");
@@ -489,7 +489,7 @@ static void ssip_rx_wd(struct timer_list *t)
 
 static void ssip_tx_wd(struct timer_list *t)
 {
-	struct ssi_protocol *ssi = from_timer(ssi, t, tx_wd);
+	struct ssi_protocol *ssi = timer_container_of(ssi, t, tx_wd);
 	struct hsi_client *cl = ssi->cl;
 
 	dev_err(&cl->device, "Watchdog triggered\n");
drivers/hwmon/npcm750-pwm-fan.c +1 -1
index db3b551828eb..802c73def428 100644
@@ -331,7 +331,7 @@ static void npcm7xx_fan_polling(struct timer_list *t)
 	struct npcm7xx_pwm_fan_data *data;
 	int i;
 
-	data = from_timer(data, t, fan_timer);
+	data = timer_container_of(data, t, fan_timer);
 
 	/*
 	 * Polling two module per one round,
drivers/hwmon/pwm-fan.c +1 -1
index d506a5e7e033..0c03bbadaddb 100644
@@ -78,7 +78,7 @@ static irqreturn_t pulse_handler(int irq, void *dev_id)
 
 static void sample_timer(struct timer_list *t)
 {
-	struct pwm_fan_ctx *ctx = from_timer(ctx, t, rpm_timer);
+	struct pwm_fan_ctx *ctx = timer_container_of(ctx, t, rpm_timer);
 	unsigned int delta = ktime_ms_delta(ktime_get(), ctx->sample_start);
 	int i;
 
drivers/i2c/busses/i2c-img-scb.c +1 -1
index 5d8b82ae6fd6..3278707bb885 100644
@@ -831,7 +831,7 @@ static unsigned int img_i2c_atomic(struct img_i2c *i2c,
  */
 static void img_i2c_check_timer(struct timer_list *t)
 {
-	struct img_i2c *i2c = from_timer(i2c, t, check_timer);
+	struct img_i2c *i2c = timer_container_of(i2c, t, check_timer);
 	unsigned long flags;
 	unsigned int line_status;
 
drivers/iio/common/ssp_sensors/ssp_dev.c +1 -1
index 22ea10eb48ae..a6ffb64a1187 100644
@@ -167,7 +167,7 @@ static void ssp_wdt_work_func(struct work_struct *work)
 
 static void ssp_wdt_timer_func(struct timer_list *t)
 {
-	struct ssp_data *data = from_timer(data, t, wdt_timer);
+	struct ssp_data *data = timer_container_of(data, t, wdt_timer);
 
 	switch (data->fw_dl_state) {
 	case SSP_FW_DL_STATE_FAIL:
drivers/infiniband/hw/cxgb4/cm.c +1 -1
index e02721a9e288..b3b45c49077d 100644
@@ -4327,7 +4327,7 @@ static DECLARE_WORK(skb_work, process_work);
 
 static void ep_timeout(struct timer_list *t)
 {
-	struct c4iw_ep *ep = from_timer(ep, t, timer);
+	struct c4iw_ep *ep = timer_container_of(ep, t, timer);
 	int kickit = 0;
 
 	spin_lock(&timeout_lock);
drivers/infiniband/hw/hfi1/aspm.c +1 -1
index 9b508eaf441d..79990d09522b 100644
@@ -169,7 +169,7 @@ void __aspm_ctx_disable(struct hfi1_ctxtdata *rcd)
 /* Timer function for re-enabling ASPM in the absence of interrupt activity */
 static  void aspm_ctx_timer_function(struct timer_list *t)
 {
-	struct hfi1_ctxtdata *rcd = from_timer(rcd, t, aspm_timer);
+	struct hfi1_ctxtdata *rcd = timer_container_of(rcd, t, aspm_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&rcd->aspm_lock, flags);
drivers/infiniband/hw/hfi1/chip.c +2 -2
index e908f529335d..0781ab756d44 100644
@@ -5548,7 +5548,7 @@ static void handle_cce_err(struct hfi1_devdata *dd, u32 unused, u64 reg)
 #define RCVERR_CHECK_TIME 10
 static void update_rcverr_timer(struct timer_list *t)
 {
-	struct hfi1_devdata *dd = from_timer(dd, t, rcverr_timer);
+	struct hfi1_devdata *dd = timer_container_of(dd, t, rcverr_timer);
 	struct hfi1_pportdata *ppd = dd->pport;
 	u32 cur_ovfl_cnt = read_dev_cntr(dd, C_RCV_OVF, CNTR_INVALID_VL);
 
@@ -12587,7 +12587,7 @@ static void do_update_synth_timer(struct work_struct *work)
 
 static void update_synth_timer(struct timer_list *t)
 {
-	struct hfi1_devdata *dd = from_timer(dd, t, synth_stats_timer);
+	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);
drivers/infiniband/hw/hfi1/driver.c +1 -1
index 3da90f2eb8e7..96bffa9e8dc7 100644
@@ -1315,7 +1315,7 @@ void shutdown_led_override(struct hfi1_pportdata *ppd)
 
 static void run_led_override(struct timer_list *t)
 {
-	struct hfi1_pportdata *ppd = from_timer(ppd, t, led_override_timer);
+	struct hfi1_pportdata *ppd = timer_container_of(ppd, t, led_override_timer);
 	struct hfi1_devdata *dd = ppd->dd;
 	unsigned long timeout;
 	int phase_idx;
drivers/infiniband/hw/hfi1/mad.c +1 -1
index b39f63ce6dfc..961fa07116f0 100644
@@ -369,7 +369,7 @@ static void send_trap(struct hfi1_ibport *ibp, struct trap_node *trap)
 
 void hfi1_handle_trap_timer(struct timer_list *t)
 {
-	struct hfi1_ibport *ibp = from_timer(ibp, t, rvp.trap_timer);
+	struct hfi1_ibport *ibp = timer_container_of(ibp, t, rvp.trap_timer);
 	struct trap_node *trap = NULL;
 	unsigned long flags;
 	int i;
drivers/infiniband/hw/hfi1/sdma.c +1 -1
index 0d2b39b7c8b5..24c0704544a5 100644
@@ -467,7 +467,7 @@ static void sdma_err_progress_check_schedule(struct sdma_engine *sde)
 static void sdma_err_progress_check(struct timer_list *t)
 {
 	unsigned index;
-	struct sdma_engine *sde = from_timer(sde, t, err_progress_check_timer);
+	struct sdma_engine *sde = timer_container_of(sde, t, err_progress_check_timer);
 
 	dd_dev_err(sde->dd, "SDE progress check event\n");
 	for (index = 0; index < sde->dd->num_sdma; index++) {
drivers/infiniband/hw/hfi1/tid_rdma.c +2 -2
index 78bf4a48c035..948b5883e9dd 100644
@@ -3981,7 +3981,7 @@ void hfi1_del_tid_reap_timer(struct rvt_qp *qp)
 
 static void hfi1_tid_timeout(struct timer_list *t)
 {
-	struct hfi1_qp_priv *qpriv = from_timer(qpriv, t, s_tid_timer);
+	struct hfi1_qp_priv *qpriv = timer_container_of(qpriv, t, s_tid_timer);
 	struct rvt_qp *qp = qpriv->owner;
 	struct rvt_dev_info *rdi = ib_to_rvt(qp->ibqp.device);
 	unsigned long flags;
@@ -4797,7 +4797,7 @@ void hfi1_del_tid_retry_timer(struct rvt_qp *qp)
 
 static void hfi1_tid_retry_timeout(struct timer_list *t)
 {
-	struct hfi1_qp_priv *priv = from_timer(priv, t, s_tid_retry_timer);
+	struct hfi1_qp_priv *priv = timer_container_of(priv, t, s_tid_retry_timer);
 	struct rvt_qp *qp = priv->owner;
 	struct rvt_swqe *wqe;
 	unsigned long flags;
drivers/infiniband/hw/hfi1/verbs.c +1 -1
index 49e0f79b950c..3cbbfccdd8cd 100644
@@ -554,7 +554,7 @@ void hfi1_16B_rcv(struct hfi1_packet *packet)
  */
 static void mem_timer(struct timer_list *t)
 {
-	struct hfi1_ibdev *dev = from_timer(dev, t, mem_timer);
+	struct hfi1_ibdev *dev = timer_container_of(dev, t, mem_timer);
 	struct list_head *list = &dev->memwait;
 	struct rvt_qp *qp = NULL;
 	struct iowait *wait;
drivers/infiniband/hw/irdma/cm.c +1 -1
index 23207f13ac1b..2a6d705bd471 100644
@@ -1263,7 +1263,7 @@ static void irdma_cm_timer_tick(struct timer_list *t)
 	struct irdma_timer_entry *send_entry, *close_entry;
 	struct list_head *list_core_temp;
 	struct list_head *list_node;
-	struct irdma_cm_core *cm_core = from_timer(cm_core, t, tcp_timer);
+	struct irdma_cm_core *cm_core = timer_container_of(cm_core, t, tcp_timer);
 	struct irdma_sc_vsi *vsi;
 	u32 settimer = 0;
 	unsigned long timetosend;
drivers/infiniband/hw/irdma/utils.c +2 -2
index d66b4f7a84ec..b510ef747399 100644
@@ -930,7 +930,7 @@ void irdma_terminate_done(struct irdma_sc_qp *qp, int timeout_occurred)
 
 static void irdma_terminate_timeout(struct timer_list *t)
 {
-	struct irdma_qp *iwqp = from_timer(iwqp, t, terminate_timer);
+	struct irdma_qp *iwqp = timer_container_of(iwqp, t, terminate_timer);
 	struct irdma_sc_qp *qp = &iwqp->sc_qp;
 
 	irdma_terminate_done(qp, 1);
@@ -1537,7 +1537,7 @@ int irdma_puda_get_tcpip_info(struct irdma_puda_cmpl_info *info,
 static void irdma_hw_stats_timeout(struct timer_list *t)
 {
 	struct irdma_vsi_pestat *pf_devstat =
-		from_timer(pf_devstat, t, stats_timer);
+		timer_container_of(pf_devstat, t, stats_timer);
 	struct irdma_sc_vsi *sc_vsi = pf_devstat->vsi;
 
 	if (sc_vsi->dev->hw_attrs.uk_attrs.hw_rev >= IRDMA_GEN_2)
drivers/infiniband/hw/mlx5/mr.c +1 -1
index 5fbebafc8774..2747b160d199 100644
@@ -838,7 +838,7 @@ static void mlx5_mkey_cache_debugfs_init(struct mlx5_ib_dev *dev)
 
 static void delay_time_func(struct timer_list *t)
 {
-	struct mlx5_ib_dev *dev = from_timer(dev, t, delay_timer);
+	struct mlx5_ib_dev *dev = timer_container_of(dev, t, delay_timer);
 
 	WRITE_ONCE(dev->fill_delay, 0);
 }
drivers/infiniband/hw/mthca/mthca_catas.c +1 -1
index 6eabef9aa211..f1d79968c985 100644
@@ -132,7 +132,7 @@ static void handle_catas(struct mthca_dev *dev)
 
 static void poll_catas(struct timer_list *t)
 {
-	struct mthca_dev *dev = from_timer(dev, t, catas_err.timer);
+	struct mthca_dev *dev = timer_container_of(dev, t, catas_err.timer);
 	int i;
 
 	for (i = 0; i < dev->catas_err.size; ++i)
drivers/infiniband/hw/qib/qib_driver.c +1 -1
index bdd724add147..9c478ab9238b 100644
@@ -659,7 +659,7 @@ int qib_set_lid(struct qib_pportdata *ppd, u32 lid, u8 lmc)
 
 static void qib_run_led_override(struct timer_list *t)
 {
-	struct qib_pportdata *ppd = from_timer(ppd, t,
+	struct qib_pportdata *ppd = timer_container_of(ppd, t,
 						    led_override_timer);
 	struct qib_devdata *dd = ppd->dd;
 	int timeoff;
drivers/infiniband/hw/qib/qib_iba6120.c +2 -2
index 277769fa9745..2640d283eee6 100644
@@ -2615,7 +2615,7 @@ static void qib_chk_6120_errormask(struct qib_devdata *dd)
  */
 static void qib_get_6120_faststats(struct timer_list *t)
 {
-	struct qib_devdata *dd = from_timer(dd, t, stats_timer);
+	struct qib_devdata *dd = timer_container_of(dd, t, stats_timer);
 	struct qib_pportdata *ppd = dd->pport;
 	unsigned long flags;
 	u64 traffic_wds;
@@ -2905,7 +2905,7 @@ static int qib_6120_set_loopback(struct qib_pportdata *ppd, const char *what)
 
 static void pma_6120_timer(struct timer_list *t)
 {
-	struct qib_chip_specific *cs = from_timer(cs, t, pma_timer);
+	struct qib_chip_specific *cs = timer_container_of(cs, t, pma_timer);
 	struct qib_pportdata *ppd = cs->ppd;
 	struct qib_ibport *ibp = &ppd->ibport_data;
 	unsigned long flags;
drivers/infiniband/hw/qib/qib_iba7220.c +2 -2
index 302c0d19f57d..0b7399d3f46e 100644
@@ -1044,7 +1044,7 @@ static int qib_decode_7220_err(struct qib_devdata *dd, char *buf, size_t blen,
 
 static void reenable_7220_chase(struct timer_list *t)
 {
-	struct qib_chippport_specific *cpspec = from_timer(cpspec, t,
+	struct qib_chippport_specific *cpspec = timer_container_of(cpspec, t,
 							 chase_timer);
 	struct qib_pportdata *ppd = &cpspec->pportdata;
 
@@ -3240,7 +3240,7 @@ static u32 qib_read_7220portcntrs(struct qib_devdata *dd, loff_t pos, u32 port,
  */
 static void qib_get_7220_faststats(struct timer_list *t)
 {
-	struct qib_devdata *dd = from_timer(dd, t, stats_timer);
+	struct qib_devdata *dd = timer_container_of(dd, t, stats_timer);
 	struct qib_pportdata *ppd = dd->pport;
 	unsigned long flags;
 	u64 traffic_wds;
drivers/infiniband/hw/qib/qib_iba7322.c +2 -2
index 7b4bf06c3b38..71258d17dbe8 100644
@@ -1721,7 +1721,7 @@ static void qib_error_tasklet(struct tasklet_struct *t)
 
 static void reenable_chase(struct timer_list *t)
 {
-	struct qib_chippport_specific *cp = from_timer(cp, t, chase_timer);
+	struct qib_chippport_specific *cp = timer_container_of(cp, t, chase_timer);
 	struct qib_pportdata *ppd = cp->ppd;
 
 	ppd->cpspec->chase_timer.expires = 0;
@@ -5084,7 +5084,7 @@ static u32 qib_read_7322portcntrs(struct qib_devdata *dd, loff_t pos, u32 port,
  */
 static void qib_get_7322_faststats(struct timer_list *t)
 {
-	struct qib_devdata *dd = from_timer(dd, t, stats_timer);
+	struct qib_devdata *dd = timer_container_of(dd, t, stats_timer);
 	struct qib_pportdata *ppd;
 	unsigned long flags;
 	u64 traffic_wds;
drivers/infiniband/hw/qib/qib_init.c +1 -1
index 33c23adec101..1c45814f5646 100644
@@ -493,7 +493,7 @@ static void enable_chip(struct qib_devdata *dd)
 
 static void verify_interrupt(struct timer_list *t)
 {
-	struct qib_devdata *dd = from_timer(dd, t, intrchk_timer);
+	struct qib_devdata *dd = timer_container_of(dd, t, intrchk_timer);
 	u64 int_counter;
 
 	if (!dd)
drivers/infiniband/hw/qib/qib_intr.c +1 -1
index 85c3187d796d..008cb4b7bd83 100644
@@ -172,7 +172,7 @@ void qib_handle_e_ibstatuschanged(struct qib_pportdata *ppd, u64 ibcs)
 
 void qib_clear_symerror_on_linkup(struct timer_list *t)
 {
-	struct qib_pportdata *ppd = from_timer(ppd, t, symerr_clear_timer);
+	struct qib_pportdata *ppd = timer_container_of(ppd, t, symerr_clear_timer);
 
 	if (ppd->lflags & QIBL_LINKACTIVE)
 		return;
drivers/infiniband/hw/qib/qib_mad.c +1 -1
index 568deb77ab4d..b4b39c6ee134 100644
@@ -2398,7 +2398,7 @@ int qib_process_mad(struct ib_device *ibdev, int mad_flags, u32 port,
 
 static void xmit_wait_timer_func(struct timer_list *t)
 {
-	struct qib_pportdata *ppd = from_timer(ppd, t, cong_stats.timer);
+	struct qib_pportdata *ppd = timer_container_of(ppd, t, cong_stats.timer);
 	struct qib_devdata *dd = dd_from_ppd(ppd);
 	unsigned long flags;
 	u8 status;
drivers/infiniband/hw/qib/qib_sd7220.c +1 -1
index c4ee120ac7fb..40bc0a34273e 100644
@@ -1385,7 +1385,7 @@ MODULE_PARM_DESC(relock_by_timer, "Allow relock attempt if link not up");
 
 static void qib_run_relock(struct timer_list *t)
 {
-	struct qib_chip_specific *cs = from_timer(cs, t, relock_timer);
+	struct qib_chip_specific *cs = timer_container_of(cs, t, relock_timer);
 	struct qib_devdata *dd = cs->dd;
 	struct qib_pportdata *ppd = dd->pport;
 	int timeoff;
drivers/infiniband/hw/qib/qib_tx.c +1 -1
index 1325110237cd..397928c80f7c 100644
@@ -548,7 +548,7 @@ void qib_hol_up(struct qib_pportdata *ppd)
  */
 void qib_hol_event(struct timer_list *t)
 {
-	struct qib_pportdata *ppd = from_timer(ppd, t, hol_timer);
+	struct qib_pportdata *ppd = timer_container_of(ppd, t, hol_timer);
 
 	/* If hardware error, etc, skip. */
 	if (!(ppd->dd->flags & QIB_INITTED))
drivers/infiniband/hw/qib/qib_verbs.c +1 -1
index 9832567a8bb8..bab657f93084 100644
@@ -361,7 +361,7 @@ void qib_ib_rcv(struct qib_ctxtdata *rcd, void *rhdr, void *data, u32 tlen)
  */
 static void mem_timer(struct timer_list *t)
 {
-	struct qib_ibdev *dev = from_timer(dev, t, mem_timer);
+	struct qib_ibdev *dev = timer_container_of(dev, t, mem_timer);
 	struct list_head *list = &dev->memwait;
 	struct rvt_qp *qp = NULL;
 	struct qib_qp_priv *priv = NULL;
drivers/infiniband/sw/rdmavt/qp.c +1 -1
index 583debe4b9a2..e825e2ef7966 100644
@@ -2585,7 +2585,7 @@ EXPORT_SYMBOL(rvt_del_timers_sync);
  */
 static void rvt_rc_timeout(struct timer_list *t)
 {
-	struct rvt_qp *qp = from_timer(qp, t, s_timer);
+	struct rvt_qp *qp = timer_container_of(qp, t, s_timer);
 	struct rvt_dev_info *rdi = ib_to_rvt(qp->ibqp.device);
 	unsigned long flags;
 
drivers/infiniband/sw/rxe/rxe_comp.c +1 -1
index d48af2180745..a5b2b62f596b 100644
@@ -114,7 +114,7 @@ static enum ib_wc_opcode wr_to_wc_opcode(enum ib_wr_opcode opcode)
 
 void retransmit_timer(struct timer_list *t)
 {
-	struct rxe_qp *qp = from_timer(qp, t, retrans_timer);
+	struct rxe_qp *qp = timer_container_of(qp, t, retrans_timer);
 	unsigned long flags;
 
 	rxe_dbg_qp(qp, "retransmit timer fired\n");
drivers/infiniband/sw/rxe/rxe_req.c +1 -1
index 9d0392df8a92..373b03f223be 100644
@@ -97,7 +97,7 @@ static void req_retry(struct rxe_qp *qp)
 
 void rnr_nak_timer(struct timer_list *t)
 {
-	struct rxe_qp *qp = from_timer(qp, t, rnr_nak_timer);
+	struct rxe_qp *qp = timer_container_of(qp, t, rnr_nak_timer);
 	unsigned long flags;
 
 	rxe_dbg_qp(qp, "nak timer fired\n");
drivers/input/ff-memless.c +1 -1
index 009822fa61b8..91636479ee3c 100644
@@ -399,7 +399,7 @@ static void ml_play_effects(struct ml_device *ml)
 
 static void ml_effect_timer(struct timer_list *t)
 {
-	struct ml_device *ml = from_timer(ml, t, timer);
+	struct ml_device *ml = timer_container_of(ml, t, timer);
 	struct input_dev *dev = ml->dev;
 
 	pr_debug("timer: updating effects\n");
drivers/input/gameport/gameport.c +1 -1
index ae51f108bfae..a419315b436d 100644
@@ -199,7 +199,7 @@ EXPORT_SYMBOL(gameport_stop_polling);
 
 static void gameport_run_poll_handler(struct timer_list *t)
 {
-	struct gameport *gameport = from_timer(gameport, t, poll_timer);
+	struct gameport *gameport = timer_container_of(gameport, t, poll_timer);
 
 	gameport->poll_handler(gameport);
 	if (gameport->poll_cnt)
drivers/input/input.c +1 -1
index ec4346f20efd..44887e51e049 100644
@@ -2249,7 +2249,7 @@ static void devm_input_device_unregister(struct device *dev, void *res)
  */
 static void input_repeat_key(struct timer_list *t)
 {
-	struct input_dev *dev = from_timer(dev, t, timer);
+	struct input_dev *dev = timer_container_of(dev, t, timer);
 
 	guard(spinlock_irqsave)(&dev->event_lock);
 
drivers/input/joystick/db9.c +1 -1
index d7a253835889..d5c67a927404 100644
@@ -351,7 +351,7 @@ static int db9_saturn(int mode, struct parport *port, struct input_dev *devs[])
 
 static void db9_timer(struct timer_list *t)
 {
-	struct db9 *db9 = from_timer(db9, t, timer);
+	struct db9 *db9 = timer_container_of(db9, t, timer);
 	struct parport *port = db9->pd->port;
 	struct input_dev *dev = db9->dev[0];
 	struct input_dev *dev2 = db9->dev[1];
drivers/input/joystick/gamecon.c +1 -1
index 9fc629ad58b8..ae95cb3d0ae9 100644
@@ -726,7 +726,7 @@ static void gc_psx_process_packet(struct gc *gc)
 
 static void gc_timer(struct timer_list *t)
 {
-	struct gc *gc = from_timer(gc, t, timer);
+	struct gc *gc = timer_container_of(gc, t, timer);
 
 /*
  * N64 pads - must be read first, any read confuses them for 200 us
drivers/input/joystick/turbografx.c +1 -1
index aa3e7d471b96..5f69aef01791 100644
@@ -72,7 +72,7 @@ static struct tgfx {
 
 static void tgfx_timer(struct timer_list *t)
 {
-	struct tgfx *tgfx = from_timer(tgfx, t, timer);
+	struct tgfx *tgfx = timer_container_of(tgfx, t, timer);
 	struct input_dev *dev;
 	int data1, data2, i;
 
drivers/input/keyboard/imx_keypad.c +1 -1
index 3cd47fa44efc..69e511a8a605 100644
@@ -183,7 +183,7 @@ static void imx_keypad_fire_events(struct imx_keypad *keypad,
  */
 static void imx_keypad_check_for_events(struct timer_list *t)
 {
-	struct imx_keypad *keypad = from_timer(keypad, t, check_matrix_timer);
+	struct imx_keypad *keypad = timer_container_of(keypad, t, check_matrix_timer);
 	unsigned short matrix_volatile_state[MAX_MATRIX_KEY_COLS];
 	unsigned short reg_val;
 	bool state_changed, is_zero_matrix;
drivers/input/keyboard/locomokbd.c +1 -1
index c501a93a4417..58d4f2096cf9 100644
@@ -194,7 +194,7 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
  */
 static void locomokbd_timer_callback(struct timer_list *t)
 {
-	struct locomokbd *locomokbd = from_timer(locomokbd, t, timer);
+	struct locomokbd *locomokbd = timer_container_of(locomokbd, t, timer);
 
 	locomokbd_scankeyboard(locomokbd);
 }
drivers/input/keyboard/snvs_pwrkey.c +1 -1
index bbf409dda89f..08a8fbfc43d5 100644
@@ -44,7 +44,7 @@ struct pwrkey_drv_data {
 
 static void imx_imx_snvs_check_for_events(struct timer_list *t)
 {
-	struct pwrkey_drv_data *pdata = from_timer(pdata, t, check_timer);
+	struct pwrkey_drv_data *pdata = timer_container_of(pdata, t, check_timer);
 	struct input_dev *input = pdata->input;
 	u32 state;
 
drivers/input/keyboard/tegra-kbc.c +1 -1
index 32a676f0de53..bc1c80a456f2 100644
@@ -240,7 +240,7 @@ static void tegra_kbc_set_fifo_interrupt(struct tegra_kbc *kbc, bool enable)
 
 static void tegra_kbc_keypress_timer(struct timer_list *t)
 {
-	struct tegra_kbc *kbc = from_timer(kbc, t, timer);
+	struct tegra_kbc *kbc = timer_container_of(kbc, t, timer);
 	u32 val;
 	unsigned int i;
 
drivers/input/misc/nxp-bbnsm-pwrkey.c +1 -1
index 7ba8d166d68c..0c7b8f8ef4a5 100644
@@ -45,7 +45,7 @@ struct bbnsm_pwrkey {
 
 static void bbnsm_pwrkey_check_for_events(struct timer_list *t)
 {
-	struct bbnsm_pwrkey *bbnsm = from_timer(bbnsm, t, check_timer);
+	struct bbnsm_pwrkey *bbnsm = timer_container_of(bbnsm, t, check_timer);
 	struct input_dev *input = bbnsm->input;
 	u32 state;
 
drivers/input/mouse/alps.c +1 -1
index 0bd7b09b0aa3..be734d65ea72 100644
@@ -1582,7 +1582,7 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
 
 static void alps_flush_packet(struct timer_list *t)
 {
-	struct alps_data *priv = from_timer(priv, t, timer);
+	struct alps_data *priv = timer_container_of(priv, t, timer);
 	struct psmouse *psmouse = priv->psmouse;
 
 	guard(serio_pause_rx)(psmouse->ps2dev.serio);
drivers/input/mouse/byd.c +1 -1
index 4ee084e00a7c..71aa23dd7d8d 100644
@@ -251,7 +251,7 @@ static void byd_report_input(struct psmouse *psmouse)
 
 static void byd_clear_touch(struct timer_list *t)
 {
-	struct byd_data *priv = from_timer(priv, t, timer);
+	struct byd_data *priv = timer_container_of(priv, t, timer);
 	struct psmouse *psmouse = priv->psmouse;
 
 	guard(serio_pause_rx)(psmouse->ps2dev.serio);
drivers/input/touchscreen/ad7877.c +1 -1
index 8d8392ce7005..c9aa1847265a 100644
@@ -375,7 +375,7 @@ static inline void ad7877_ts_event_release(struct ad7877 *ts)
 
 static void ad7877_timer(struct timer_list *t)
 {
-	struct ad7877 *ts = from_timer(ts, t, timer);
+	struct ad7877 *ts = timer_container_of(ts, t, timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&ts->lock, flags);
drivers/input/touchscreen/ad7879.c +1 -1
index f661e199b63c..f9db5cefb25b 100644
@@ -237,7 +237,7 @@ static void ad7879_ts_event_release(struct ad7879 *ts)
 
 static void ad7879_timer(struct timer_list *t)
 {
-	struct ad7879 *ts = from_timer(ts, t, timer);
+	struct ad7879 *ts = timer_container_of(ts, t, timer);
 
 	ad7879_ts_event_release(ts);
 }
drivers/input/touchscreen/bu21029_ts.c +1 -1
index 3c997fba7048..1f1157dd3be5 100644
@@ -209,7 +209,7 @@ static void bu21029_touch_report(struct bu21029_ts_data *bu21029, const u8 *buf)
 
 static void bu21029_touch_release(struct timer_list *t)
 {
-	struct bu21029_ts_data *bu21029 = from_timer(bu21029, t, timer);
+	struct bu21029_ts_data *bu21029 = timer_container_of(bu21029, t, timer);
 
 	input_report_abs(bu21029->in_dev, ABS_PRESSURE, 0);
 	input_report_key(bu21029->in_dev, BTN_TOUCH, 0);
drivers/input/touchscreen/exc3000.c +1 -1
index 9a5977d8cad2..28da7ba55a4b 100644
@@ -105,7 +105,7 @@ static void exc3000_report_slots(struct input_dev *input,
 
 static void exc3000_timer(struct timer_list *t)
 {
-	struct exc3000_data *data = from_timer(data, t, timer);
+	struct exc3000_data *data = timer_container_of(data, t, timer);
 
 	input_mt_sync_frame(data->input);
 	input_sync(data->input);
drivers/input/touchscreen/sx8654.c +1 -1
index e59b8d0ed19e..5fa47a1a6fdc 100644
@@ -116,7 +116,7 @@ static inline void sx865x_penrelease(struct sx8654 *ts)
 
 static void sx865x_penrelease_timer_handler(struct timer_list *t)
 {
-	struct sx8654 *ts = from_timer(ts, t, timer);
+	struct sx8654 *ts = timer_container_of(ts, t, timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&ts->lock, flags);
drivers/input/touchscreen/tsc200x-core.c +1 -1
index 252a93753ee5..82d7d1cf5010 100644
@@ -194,7 +194,7 @@ static irqreturn_t tsc200x_irq_thread(int irq, void *_ts)
 
 static void tsc200x_penup_timer(struct timer_list *t)
 {
-	struct tsc200x *ts = from_timer(ts, t, penup_timer);
+	struct tsc200x *ts = timer_container_of(ts, t, penup_timer);
 
 	guard(spinlock_irqsave)(&ts->lock);
 	tsc200x_update_pen_state(ts, 0, 0, 0);
drivers/iommu/dma-iommu.c +1 -1
index a775e4dbe06f..d4352f13c172 100644
@@ -176,7 +176,7 @@ static void fq_flush_iotlb(struct iommu_dma_cookie *cookie)
 
 static void fq_flush_timeout(struct timer_list *t)
 {
-	struct iommu_dma_cookie *cookie = from_timer(cookie, t, fq_timer);
+	struct iommu_dma_cookie *cookie = timer_container_of(cookie, t, fq_timer);
 	int cpu;
 
 	atomic_set(&cookie->fq_timer_on, 0);
drivers/isdn/hardware/mISDN/hfcpci.c +1 -1
index e3870d942699..2b05722d4dbe 100644
@@ -291,7 +291,7 @@ reset_hfcpci(struct hfc_pci *hc)
 static void
 hfcpci_Timer(struct timer_list *t)
 {
-	struct hfc_pci *hc = from_timer(hc, t, hw.timer);
+	struct hfc_pci *hc = timer_container_of(hc, t, hw.timer);
 	hc->hw.timer.expires = jiffies + 75;
 	/* WD RESET */
 /*
drivers/isdn/hardware/mISDN/mISDNipac.c +1 -1
index 165a63994f04..a34ea6058960 100644
@@ -713,7 +713,7 @@ isac_release(struct isac_hw *isac)
 static void
 dbusy_timer_handler(struct timer_list *t)
 {
-	struct isac_hw *isac = from_timer(isac, t, dch.timer);
+	struct isac_hw *isac = timer_container_of(isac, t, dch.timer);
 	int rbch, star;
 	u_long flags;
 
drivers/isdn/hardware/mISDN/mISDNisar.c +1 -1
index e48f89cbecf8..dace91ba412b 100644
@@ -1135,7 +1135,7 @@ EXPORT_SYMBOL(mISDNisar_irq);
 static void
 ftimer_handler(struct timer_list *t)
 {
-	struct isar_ch *ch = from_timer(ch, t, ftimer);
+	struct isar_ch *ch = timer_container_of(ch, t, ftimer);
 
 	pr_debug("%s: ftimer flags %lx\n", ch->is->name, ch->bch.Flags);
 	test_and_clear_bit(FLG_FTI_RUN, &ch->bch.Flags);
drivers/isdn/hardware/mISDN/w6692.c +1 -1
index da933f4bdf4e..168fc345dcdc 100644
@@ -802,7 +802,7 @@ w6692_irq(int intno, void *dev_id)
 static void
 dbusy_timer_handler(struct timer_list *t)
 {
-	struct dchannel *dch = from_timer(dch, t, timer);
+	struct dchannel *dch = timer_container_of(dch, t, timer);
 	struct w6692_hw	*card = dch->hw;
 	int		rbch, star;
 	u_long		flags;
drivers/isdn/mISDN/dsp_tones.c +1 -1
index 456b313bfa76..fa7813ae8d97 100644
@@ -459,7 +459,7 @@ dsp_tone_hw_message(struct dsp *dsp, u8 *sample, int len)
 void
 dsp_tone_timeout(struct timer_list *t)
 {
-	struct dsp *dsp = from_timer(dsp, t, tone.tl);
+	struct dsp *dsp = timer_container_of(dsp, t, tone.tl);
 	struct dsp_tone *tone = &dsp->tone;
 	struct pattern *pat = (struct pattern *)tone->pattern;
 	int index = tone->index;
drivers/isdn/mISDN/fsm.c +1 -1
index 5ed0a6110687..825b686496d2 100644
@@ -95,7 +95,7 @@ EXPORT_SYMBOL(mISDN_FsmChangeState);
 static void
 FsmExpireTimer(struct timer_list *t)
 {
-	struct FsmTimer *ft = from_timer(ft, t, tl);
+	struct FsmTimer *ft = timer_container_of(ft, t, tl);
 #if FSM_TIMER_DEBUG
 	if (ft->fi->debug)
 		ft->fi->printdebug(ft->fi, "FsmExpireTimer %lx", (long) ft);
drivers/isdn/mISDN/l1oip_core.c +2 -2
index a5ad88a960d0..16226a280c02 100644
@@ -822,7 +822,7 @@ l1oip_send_bh(struct work_struct *work)
 static void
 l1oip_keepalive(struct timer_list *t)
 {
-	struct l1oip *hc = from_timer(hc, t, keep_tl);
+	struct l1oip *hc = timer_container_of(hc, t, keep_tl);
 
 	schedule_work(&hc->workq);
 }
@@ -830,7 +830,7 @@ l1oip_keepalive(struct timer_list *t)
 static void
 l1oip_timeout(struct timer_list *t)
 {
-	struct l1oip			*hc = from_timer(hc, t,
+	struct l1oip			*hc = timer_container_of(hc, t,
 								  timeout_tl);
 	struct dchannel		*dch = hc->chan[hc->d_idx].dch;
 
drivers/isdn/mISDN/timerdev.c +1 -1
index 7cfa8c61dba0..df98144a9539 100644
@@ -155,7 +155,7 @@ mISDN_poll(struct file *filep, poll_table *wait)
 static void
 dev_expire_timer(struct timer_list *t)
 {
-	struct mISDNtimer *timer = from_timer(timer, t, tl);
+	struct mISDNtimer *timer = timer_container_of(timer, t, tl);
 	u_long			flags;
 
 	spin_lock_irqsave(&timer->dev->lock, flags);
drivers/leds/flash/leds-rt8515.c +1 -1
index 32ba397a33d2..6af0d2c7fc56 100644
@@ -165,7 +165,7 @@ static const struct led_flash_ops rt8515_flash_ops = {
 
 static void rt8515_powerdown_timer(struct timer_list *t)
 {
-	struct rt8515 *rt = from_timer(rt, t, powerdown_timer);
+	struct rt8515 *rt = timer_container_of(rt, t, powerdown_timer);
 
 	/* Turn the LED off */
 	rt8515_gpio_led_off(rt);
drivers/leds/flash/leds-sgm3140.c +1 -1
index 48fb8a9ec703..3e83200675f2 100644
@@ -135,7 +135,7 @@ static int sgm3140_brightness_set(struct led_classdev *led_cdev,
 
 static void sgm3140_powerdown_timer(struct timer_list *t)
 {
-	struct sgm3140 *priv = from_timer(priv, t, powerdown_timer);
+	struct sgm3140 *priv = timer_container_of(priv, t, powerdown_timer);
 
 	gpiod_set_value(priv->enable_gpio, 0);
 	gpiod_set_value(priv->flash_gpio, 0);
drivers/leds/led-core.c +1 -1
index 907fc703e0c5..bd451c77ce4d 100644
@@ -64,7 +64,7 @@ static int __led_set_brightness_blocking(struct led_classdev *led_cdev, unsigned
 
 static void led_timer_function(struct timer_list *t)
 {
-	struct led_classdev *led_cdev = from_timer(led_cdev, t, blink_timer);
+	struct led_classdev *led_cdev = timer_container_of(led_cdev, t, blink_timer);
 	unsigned long brightness;
 	unsigned long delay;
 
drivers/leds/trigger/ledtrig-activity.c +1 -1
index b3ee33aed36e..1bccaef5eddf 100644
@@ -32,7 +32,7 @@ struct activity_data {
 
 static void led_activity_function(struct timer_list *t)
 {
-	struct activity_data *activity_data = from_timer(activity_data, t,
+	struct activity_data *activity_data = timer_container_of(activity_data, t,
 							 timer);
 	struct led_classdev *led_cdev = activity_data->led_cdev;
 	unsigned int target;
drivers/leds/trigger/ledtrig-heartbeat.c +1 -1
index 393b3ae832f4..40eb61b6d54e 100644
@@ -33,7 +33,7 @@ struct heartbeat_trig_data {
 static void led_heartbeat_function(struct timer_list *t)
 {
 	struct heartbeat_trig_data *heartbeat_data =
-		from_timer(heartbeat_data, t, timer);
+		timer_container_of(heartbeat_data, t, timer);
 	struct led_classdev *led_cdev;
 	unsigned long brightness = LED_OFF;
 	unsigned long delay = 0;
drivers/leds/trigger/ledtrig-pattern.c +1 -1
index 06d052957d37..9af3c18f14f4 100644
@@ -150,7 +150,7 @@ static void pattern_trig_timer_common_function(struct pattern_trig_data *data)
 
 static void pattern_trig_timer_function(struct timer_list *t)
 {
-	struct pattern_trig_data *data = from_timer(data, t, timer);
+	struct pattern_trig_data *data = timer_container_of(data, t, timer);
 
 	return pattern_trig_timer_common_function(data);
 }
drivers/leds/trigger/ledtrig-transient.c +1 -1
index e103c7ed830b..20f1351464b1 100644
@@ -32,7 +32,7 @@ struct transient_trig_data {
 static void transient_timer_function(struct timer_list *t)
 {
 	struct transient_trig_data *transient_data =
-		from_timer(transient_data, t, timer);
+		timer_container_of(transient_data, t, timer);
 	struct led_classdev *led_cdev = transient_data->led_cdev;
 
 	transient_data->activate = 0;
drivers/mailbox/mailbox-altera.c +1 -1
index 748128661892..17278c2571d3 100644
@@ -130,7 +130,7 @@ static void altera_mbox_rx_data(struct mbox_chan *chan)
 
 static void altera_mbox_poll_rx(struct timer_list *t)
 {
-	struct altera_mbox *mbox = from_timer(mbox, t, rxpoll_timer);
+	struct altera_mbox *mbox = timer_container_of(mbox, t, rxpoll_timer);
 
 	altera_mbox_rx_data(mbox->chan);
 
drivers/md/bcache/stats.c +1 -1
index d39dec34b7a3..0056106495a7 100644
@@ -149,7 +149,7 @@ static void scale_stats(struct cache_stats *stats, unsigned long rescale_at)
 
 static void scale_accounting(struct timer_list *t)
 {
-	struct cache_accounting *acc = from_timer(acc, t, timer);
+	struct cache_accounting *acc = timer_container_of(acc, t, timer);
 
 #define move_stat(name) do {						\
 	unsigned int t = atomic_xchg(&acc->collector.name, 0);		\
drivers/md/dm-delay.c +1 -1
index d4cf0ac2a7aa..6f4367944584 100644
@@ -52,7 +52,7 @@ struct dm_delay_info {
 
 static void handle_delayed_timer(struct timer_list *t)
 {
-	struct delay_c *dc = from_timer(dc, t, delay_timer);
+	struct delay_c *dc = timer_container_of(dc, t, delay_timer);
 
 	queue_work(dc->kdelayd_wq, &dc->flush_expired_bios);
 }
drivers/md/dm-integrity.c +1 -1
index 2a283feb3319..e90cfcef96f4 100644
@@ -1540,7 +1540,7 @@ static void sleep_on_endio_wait(struct dm_integrity_c *ic)
 
 static void autocommit_fn(struct timer_list *t)
 {
-	struct dm_integrity_c *ic = from_timer(ic, t, autocommit_timer);
+	struct dm_integrity_c *ic = timer_container_of(ic, t, autocommit_timer);
 
 	if (likely(!dm_integrity_failed(ic)))
 		queue_work(ic->commit_wq, &ic->commit_work);
drivers/md/dm-mpath.c +1 -1
index 6c98f4ae5ea9..ff55a5e4f5c9 100644
@@ -787,7 +787,7 @@ static int queue_if_no_path(struct multipath *m, bool f_queue_if_no_path,
  */
 static void queue_if_no_path_timeout_work(struct timer_list *t)
 {
-	struct multipath *m = from_timer(m, t, nopath_timer);
+	struct multipath *m = timer_container_of(m, t, nopath_timer);
 
 	DMWARN("queue_if_no_path timeout on %s, failing queued IO",
 	       dm_table_device_name(m->ti->table));
drivers/md/dm-raid1.c +1 -1
index 9e615b4f1f5e..d2b73e7bc9cd 100644
@@ -103,7 +103,7 @@ static void wakeup_mirrord(void *context)
 
 static void delayed_wake_fn(struct timer_list *t)
 {
-	struct mirror_set *ms = from_timer(ms, t, timer);
+	struct mirror_set *ms = timer_container_of(ms, t, timer);
 
 	clear_bit(0, &ms->timer_pending);
 	wakeup_mirrord(ms);
drivers/md/dm-vdo/dedupe.c +1 -1
index 3c58b941e067..4d983092a152 100644
@@ -2337,7 +2337,7 @@ static void timeout_index_operations_callback(struct vdo_completion *completion)
 
 static void timeout_index_operations(struct timer_list *t)
 {
-	struct hash_zone *zone = from_timer(zone, t, timer);
+	struct hash_zone *zone = timer_container_of(zone, t, timer);
 
 	if (change_timer_state(zone, DEDUPE_QUERY_TIMER_RUNNING,
 			       DEDUPE_QUERY_TIMER_FIRED))
drivers/md/dm-writecache.c +2 -2
index d6a04a57472d..a428e1cacf07 100644
@@ -706,7 +706,7 @@ static inline void writecache_verify_watermark(struct dm_writecache *wc)
 
 static void writecache_max_age_timer(struct timer_list *t)
 {
-	struct dm_writecache *wc = from_timer(wc, t, max_age_timer);
+	struct dm_writecache *wc = timer_container_of(wc, t, max_age_timer);
 
 	if (!dm_suspended(wc->ti) && !writecache_has_error(wc)) {
 		queue_work(wc->writeback_wq, &wc->writeback_work);
@@ -866,7 +866,7 @@ static void writecache_flush_work(struct work_struct *work)
 
 static void writecache_autocommit_timer(struct timer_list *t)
 {
-	struct dm_writecache *wc = from_timer(wc, t, autocommit_timer);
+	struct dm_writecache *wc = timer_container_of(wc, t, autocommit_timer);
 
 	if (!writecache_has_error(wc))
 		queue_work(wc->writeback_wq, &wc->flush_work);
drivers/md/md.c +1 -1
index 9daa78c5fe33..b4a845e29f28 100644
@@ -5995,7 +5995,7 @@ static int add_named_array(const char *val, const struct kernel_param *kp)
 
 static void md_safemode_timeout(struct timer_list *t)
 {
-	struct mddev *mddev = from_timer(mddev, t, safemode_timer);
+	struct mddev *mddev = timer_container_of(mddev, t, safemode_timer);
 
 	mddev->safemode = 1;
 	if (mddev->external)
drivers/media/common/saa7146/saa7146_fops.c +1 -1
index 2952678cce45..9d0362a75ecd 100644
@@ -153,7 +153,7 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
 
 void saa7146_buffer_timeout(struct timer_list *t)
 {
-	struct saa7146_dmaqueue *q = from_timer(q, t, timeout);
+	struct saa7146_dmaqueue *q = timer_container_of(q, t, timeout);
 	struct saa7146_dev *dev = q->dev;
 	unsigned long flags;
 
drivers/media/common/saa7146/saa7146_vbi.c +1 -1
index 6c324a683be9..1ffcc025d1a4 100644
@@ -330,7 +330,7 @@ static void vbi_stop(struct saa7146_dev *dev)
 
 static void vbi_read_timeout(struct timer_list *t)
 {
-	struct saa7146_vv *vv = from_timer(vv, t, vbi_read_timeout);
+	struct saa7146_vv *vv = timer_container_of(vv, t, vbi_read_timeout);
 	struct saa7146_dev *dev = vv->vbi_dmaq.dev;
 
 	DEB_VBI("dev:%p\n", dev);
drivers/media/dvb-core/dmxdev.c +1 -1
index 1e985f943944..8fb5989ec31a 100644
@@ -352,7 +352,7 @@ static int dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter,
 
 static void dvb_dmxdev_filter_timeout(struct timer_list *t)
 {
-	struct dmxdev_filter *dmxdevfilter = from_timer(dmxdevfilter, t, timer);
+	struct dmxdev_filter *dmxdevfilter = timer_container_of(dmxdevfilter, t, timer);
 
 	dmxdevfilter->buffer.error = -ETIMEDOUT;
 	spin_lock_irq(&dmxdevfilter->dev->lock);
drivers/media/i2c/tc358743.c +1 -1
index 2d5f42f11158..88027cbc3e61 100644
@@ -1501,7 +1501,7 @@ static irqreturn_t tc358743_irq_handler(int irq, void *dev_id)
 
 static void tc358743_irq_poll_timer(struct timer_list *t)
 {
-	struct tc358743_state *state = from_timer(state, t, timer);
+	struct tc358743_state *state = timer_container_of(state, t, timer);
 	unsigned int msecs;
 
 	schedule_work(&state->work_i2c_poll);
drivers/media/i2c/tvaudio.c +1 -1
index 42115118a0bd..6267e9ad39c0 100644
@@ -318,7 +318,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
 static void chip_thread_wake(struct timer_list *t)
 {
-	struct CHIPSTATE *chip = from_timer(chip, t, wt);
+	struct CHIPSTATE *chip = timer_container_of(chip, t, wt);
 	wake_up_process(chip->thread);
 }
 
drivers/media/pci/bt8xx/bttv-driver.c +1 -1
index 377a7e7f0499..9ce67f515843 100644
@@ -2798,7 +2798,7 @@ bttv_irq_wakeup_vbi(struct bttv *btv, struct bttv_buffer *wakeup,
 
 static void bttv_irq_timeout(struct timer_list *t)
 {
-	struct bttv *btv = from_timer(btv, t, timeout);
+	struct bttv *btv = timer_container_of(btv, t, timeout);
 	struct bttv_buffer_set old,new;
 	struct bttv_buffer *ovbi;
 	struct bttv_buffer *item;
drivers/media/pci/bt8xx/bttv-input.c +2 -2
index 9eb7a5356b4c..84aa269248fd 100644
@@ -126,7 +126,7 @@ void bttv_input_irq(struct bttv *btv)
 
 static void bttv_input_timer(struct timer_list *t)
 {
-	struct bttv_ir *ir = from_timer(ir, t, timer);
+	struct bttv_ir *ir = timer_container_of(ir, t, timer);
 	struct bttv *btv = ir->btv;
 
 	if (btv->c.type == BTTV_BOARD_ENLTV_FM_2)
@@ -182,7 +182,7 @@ static u32 bttv_rc5_decode(unsigned int code)
 
 static void bttv_rc5_timer_end(struct timer_list *t)
 {
-	struct bttv_ir *ir = from_timer(ir, t, timer);
+	struct bttv_ir *ir = timer_container_of(ir, t, timer);
 	ktime_t tv;
 	u32 gap, rc5, scancode;
 	u8 toggle, command, system;
drivers/media/pci/cx18/cx18-fileops.c +1 -1
index 7e742733391b..315577d71d95 100644
@@ -628,7 +628,7 @@ __poll_t cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
 
 void cx18_vb_timeout(struct timer_list *t)
 {
-	struct cx18_stream *s = from_timer(s, t, vb_timeout);
+	struct cx18_stream *s = timer_container_of(s, t, vb_timeout);
 
 	/*
 	 * Return all of the buffers in error state, so the vbi/vid inode
drivers/media/pci/ivtv/ivtv-irq.c +1 -1
index b3b670b6ef70..748c14e87963 100644
@@ -1064,7 +1064,7 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
 
 void ivtv_unfinished_dma(struct timer_list *t)
 {
-	struct ivtv *itv = from_timer(itv, t, dma_timer);
+	struct ivtv *itv = timer_container_of(itv, t, dma_timer);
 
 	if (!test_bit(IVTV_F_I_DMA, &itv->i_flags))
 		return;
drivers/media/pci/netup_unidvb/netup_unidvb_core.c +1 -1
index 16338d13d9c8..9f2ac33cffa7 100644
@@ -637,7 +637,7 @@ static void netup_unidvb_queue_cleanup(struct netup_dma *dma)
 
 static void netup_unidvb_dma_timeout(struct timer_list *t)
 {
-	struct netup_dma *dma = from_timer(dma, t, timeout);
+	struct netup_dma *dma = timer_container_of(dma, t, timeout);
 	struct netup_unidvb_dev *ndev = dma->ndev;
 
 	dev_dbg(&ndev->pci_dev->dev, "%s()\n", __func__);
drivers/media/pci/saa7134/saa7134-core.c +1 -1
index 84295bdb8ce4..537aa65acdc8 100644
@@ -328,7 +328,7 @@ void saa7134_buffer_next(struct saa7134_dev *dev,
 
 void saa7134_buffer_timeout(struct timer_list *t)
 {
-	struct saa7134_dmaqueue *q = from_timer(q, t, timeout);
+	struct saa7134_dmaqueue *q = timer_container_of(q, t, timeout);
 	struct saa7134_dev *dev = q->dev;
 	unsigned long flags;
 
drivers/media/pci/saa7134/saa7134-input.c +1 -1
index d7d97c7d4a2b..468dbe8d552f 100644
@@ -431,7 +431,7 @@ void saa7134_input_irq(struct saa7134_dev *dev)
 
 static void saa7134_input_timer(struct timer_list *t)
 {
-	struct saa7134_card_ir *ir = from_timer(ir, t, timer);
+	struct saa7134_card_ir *ir = timer_container_of(ir, t, timer);
 	struct saa7134_dev *dev = ir->dev->priv;
 
 	build_key(dev);
drivers/media/pci/tw686x/tw686x-core.c +1 -1
index 80bd268926cc..f39e0e34deb6 100644
@@ -125,7 +125,7 @@ void tw686x_enable_channel(struct tw686x_dev *dev, unsigned int channel)
  */
 static void tw686x_dma_delay(struct timer_list *t)
 {
-	struct tw686x_dev *dev = from_timer(dev, t, dma_delay_timer);
+	struct tw686x_dev *dev = timer_container_of(dev, t, dma_delay_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&dev->lock, flags);
drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c +1 -1
index c8e0ee383af3..e571042023e5 100644
@@ -143,7 +143,7 @@ void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq)
 
 static void s5p_mfc_watchdog(struct timer_list *t)
 {
-	struct s5p_mfc_dev *dev = from_timer(dev, t, watchdog_timer);
+	struct s5p_mfc_dev *dev = timer_container_of(dev, t, watchdog_timer);
 
 	if (test_bit(0, &dev->hw_lock))
 		atomic_inc(&dev->watchdog_cnt);
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +1 -1
index 87a817dda4a9..602c37cbe177 100644
@@ -62,7 +62,7 @@ static int load_c8sectpfe_fw(struct c8sectpfei *fei);
 
 static void c8sectpfe_timer_interrupt(struct timer_list *t)
 {
-	struct c8sectpfei *fei = from_timer(fei, t, timer);
+	struct c8sectpfei *fei = timer_container_of(fei, t, timer);
 	struct channel_info *channel;
 	int chan_num;
 
drivers/media/radio/radio-cadet.c +1 -1
index 2ddf1dfa0522..5110754e1a31 100644
@@ -284,7 +284,7 @@ static bool cadet_has_rds_data(struct cadet *dev)
 
 static void cadet_handler(struct timer_list *t)
 {
-	struct cadet *dev = from_timer(dev, t, readtimer);
+	struct cadet *dev = timer_container_of(dev, t, readtimer);
 
 	/* Service the RDS fifo */
 	if (mutex_trylock(&dev->lock)) {
drivers/media/rc/ene_ir.c +1 -1
index 9435cba3f4d9..d6c54a3bccc2 100644
@@ -659,7 +659,7 @@ static void ene_tx_sample(struct ene_device *dev)
 /* timer to simulate tx done interrupt */
 static void ene_tx_irqsim(struct timer_list *t)
 {
-	struct ene_device *dev = from_timer(dev, t, tx_sim_timer);
+	struct ene_device *dev = timer_container_of(dev, t, tx_sim_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&dev->hw_lock, flags);
drivers/media/rc/igorplugusb.c +1 -1
index bfe86588c69b..e034c93d57cf 100644
@@ -131,7 +131,7 @@ static void igorplugusb_cmd(struct igorplugusb *ir, int cmd)
 
 static void igorplugusb_timer(struct timer_list *t)
 {
-	struct igorplugusb *ir = from_timer(ir, t, timer);
+	struct igorplugusb *ir = timer_container_of(ir, t, timer);
 
 	igorplugusb_cmd(ir, GET_INFRACODE);
 }
drivers/media/rc/img-ir/img-ir-hw.c +2 -2
index da89ddf771c3..426b3f21cbad 100644
@@ -865,7 +865,7 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw)
 /* timer function to end waiting for repeat. */
 static void img_ir_end_timer(struct timer_list *t)
 {
-	struct img_ir_priv *priv = from_timer(priv, t, hw.end_timer);
+	struct img_ir_priv *priv = timer_container_of(priv, t, hw.end_timer);
 
 	spin_lock_irq(&priv->lock);
 	img_ir_end_repeat(priv);
@@ -879,7 +879,7 @@ static void img_ir_end_timer(struct timer_list *t)
  */
 static void img_ir_suspend_timer(struct timer_list *t)
 {
-	struct img_ir_priv *priv = from_timer(priv, t, hw.suspend_timer);
+	struct img_ir_priv *priv = timer_container_of(priv, t, hw.suspend_timer);
 
 	spin_lock_irq(&priv->lock);
 	/*
drivers/media/rc/img-ir/img-ir-raw.c +1 -1
index 669f3309e237..92fb7b555a0f 100644
@@ -65,7 +65,7 @@ void img_ir_isr_raw(struct img_ir_priv *priv, u32 irq_status)
  */
 static void img_ir_echo_timer(struct timer_list *t)
 {
-	struct img_ir_priv *priv = from_timer(priv, t, raw.timer);
+	struct img_ir_priv *priv = timer_container_of(priv, t, raw.timer);
 
 	spin_lock_irq(&priv->lock);
 
drivers/media/rc/imon.c +1 -1
index cb6f36ebe5c8..f5221b018808 100644
@@ -1091,7 +1091,7 @@ static void usb_tx_callback(struct urb *urb)
  */
 static void imon_touch_display_timeout(struct timer_list *t)
 {
-	struct imon_context *ictx = from_timer(ictx, t, ttimer);
+	struct imon_context *ictx = timer_container_of(ictx, t, ttimer);
 
 	if (ictx->display_type != IMON_DISPLAY_TYPE_VGA)
 		return;
drivers/media/rc/ir-mce_kbd-decoder.c +1 -1
index 817030fb50c9..f19da3231cc4 100644
@@ -109,7 +109,7 @@ static unsigned char kbd_keycodes[256] = {
 
 static void mce_kbd_rx_timeout(struct timer_list *t)
 {
-	struct ir_raw_event_ctrl *raw = from_timer(raw, t, mce_kbd.rx_timeout);
+	struct ir_raw_event_ctrl *raw = timer_container_of(raw, t, mce_kbd.rx_timeout);
 	unsigned char maskcode;
 	unsigned long flags;
 	int i;
drivers/media/rc/rc-ir-raw.c +1 -1
index aa4ac43c66fa..7f4a17efc985 100644
@@ -552,7 +552,7 @@ EXPORT_SYMBOL(ir_raw_encode_scancode);
  */
 static void ir_raw_edge_handle(struct timer_list *t)
 {
-	struct ir_raw_event_ctrl *raw = from_timer(raw, t, edge_handle);
+	struct ir_raw_event_ctrl *raw = timer_container_of(raw, t, edge_handle);
 	struct rc_dev *dev = raw->dev;
 	unsigned long flags;
 	ktime_t interval;
drivers/media/rc/rc-main.c +2 -2
index e46358fb8ac0..b9bf5cdcde4a 100644
@@ -674,7 +674,7 @@ EXPORT_SYMBOL_GPL(rc_keyup);
  */
 static void ir_timer_keyup(struct timer_list *t)
 {
-	struct rc_dev *dev = from_timer(dev, t, timer_keyup);
+	struct rc_dev *dev = timer_container_of(dev, t, timer_keyup);
 	unsigned long flags;
 
 	/*
@@ -703,7 +703,7 @@ static void ir_timer_keyup(struct timer_list *t)
  */
 static void ir_timer_repeat(struct timer_list *t)
 {
-	struct rc_dev *dev = from_timer(dev, t, timer_repeat);
+	struct rc_dev *dev = timer_container_of(dev, t, timer_repeat);
 	struct input_dev *input = dev->input_dev;
 	unsigned long flags;
 
drivers/media/usb/au0828/au0828-dvb.c +1 -1
index 3666f4452d11..5d0447ff7d06 100644
@@ -97,7 +97,7 @@ static void au0828_restart_dvb_streaming(struct work_struct *work);
 
 static void au0828_bulk_timeout(struct timer_list *t)
 {
-	struct au0828_dev *dev = from_timer(dev, t, bulk_timeout);
+	struct au0828_dev *dev = timer_container_of(dev, t, bulk_timeout);
 
 	dprintk(1, "%s called\n", __func__);
 	dev->bulk_timeout_running = 0;
drivers/media/usb/au0828/au0828-video.c +2 -2
index 33d1fad0f7b8..e5dff969ed57 100644
@@ -948,7 +948,7 @@ int au0828_analog_unregister(struct au0828_dev *dev)
    such as tvtime from hanging) */
 static void au0828_vid_buffer_timeout(struct timer_list *t)
 {
-	struct au0828_dev *dev = from_timer(dev, t, vid_timeout);
+	struct au0828_dev *dev = timer_container_of(dev, t, vid_timeout);
 	struct au0828_dmaqueue *dma_q = &dev->vidq;
 	struct au0828_buffer *buf;
 	unsigned char *vid_data;
@@ -972,7 +972,7 @@ static void au0828_vid_buffer_timeout(struct timer_list *t)
 
 static void au0828_vbi_buffer_timeout(struct timer_list *t)
 {
-	struct au0828_dev *dev = from_timer(dev, t, vbi_timeout);
+	struct au0828_dev *dev = timer_container_of(dev, t, vbi_timeout);
 	struct au0828_dmaqueue *dma_q = &dev->vbiq;
 	struct au0828_buffer *buf;
 	unsigned char *vbi_data;
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +5 -5
index 9a583eeaa329..9ae5eee5ed62 100644
@@ -3562,7 +3562,7 @@ struct hdw_timer {
 
 static void pvr2_ctl_timeout(struct timer_list *t)
 {
-	struct hdw_timer *timer = from_timer(timer, t, timer);
+	struct hdw_timer *timer = timer_container_of(timer, t, timer);
 	struct pvr2_hdw *hdw = timer->hdw;
 
 	if (hdw->ctl_write_pend_flag || hdw->ctl_read_pend_flag) {
@@ -4421,7 +4421,7 @@ static int state_eval_encoder_run(struct pvr2_hdw *hdw)
 /* Timeout function for quiescent timer. */
 static void pvr2_hdw_quiescent_timeout(struct timer_list *t)
 {
-	struct pvr2_hdw *hdw = from_timer(hdw, t, quiescent_timer);
+	struct pvr2_hdw *hdw = timer_container_of(hdw, t, quiescent_timer);
 	hdw->state_decoder_quiescent = !0;
 	trace_stbit("state_decoder_quiescent",hdw->state_decoder_quiescent);
 	hdw->state_stale = !0;
@@ -4432,7 +4432,7 @@ static void pvr2_hdw_quiescent_timeout(struct timer_list *t)
 /* Timeout function for decoder stabilization timer. */
 static void pvr2_hdw_decoder_stabilization_timeout(struct timer_list *t)
 {
-	struct pvr2_hdw *hdw = from_timer(hdw, t, decoder_stabilization_timer);
+	struct pvr2_hdw *hdw = timer_container_of(hdw, t, decoder_stabilization_timer);
 	hdw->state_decoder_ready = !0;
 	trace_stbit("state_decoder_ready", hdw->state_decoder_ready);
 	hdw->state_stale = !0;
@@ -4443,7 +4443,7 @@ static void pvr2_hdw_decoder_stabilization_timeout(struct timer_list *t)
 /* Timeout function for encoder wait timer. */
 static void pvr2_hdw_encoder_wait_timeout(struct timer_list *t)
 {
-	struct pvr2_hdw *hdw = from_timer(hdw, t, encoder_wait_timer);
+	struct pvr2_hdw *hdw = timer_container_of(hdw, t, encoder_wait_timer);
 	hdw->state_encoder_waitok = !0;
 	trace_stbit("state_encoder_waitok",hdw->state_encoder_waitok);
 	hdw->state_stale = !0;
@@ -4454,7 +4454,7 @@ static void pvr2_hdw_encoder_wait_timeout(struct timer_list *t)
 /* Timeout function for encoder run timer. */
 static void pvr2_hdw_encoder_run_timeout(struct timer_list *t)
 {
-	struct pvr2_hdw *hdw = from_timer(hdw, t, encoder_run_timer);
+	struct pvr2_hdw *hdw = timer_container_of(hdw, t, encoder_run_timer);
 	if (!hdw->state_encoder_runok) {
 		hdw->state_encoder_runok = !0;
 		trace_stbit("state_encoder_runok",hdw->state_encoder_runok);
drivers/media/usb/s2255/s2255drv.c +1 -1
index 899a7a67e2ba..8332f2c5aed7 100644
@@ -471,7 +471,7 @@ static void s2255_reset_dsppower(struct s2255_dev *dev)
  */
 static void s2255_timer(struct timer_list *t)
 {
-	struct s2255_dev *dev = from_timer(dev, t, timer);
+	struct s2255_dev *dev = timer_container_of(dev, t, timer);
 	struct s2255_fw *data = dev->fw_data;
 	if (usb_submit_urb(data->fw_urb, GFP_ATOMIC) < 0) {
 		pr_err("s2255: can't submit urb\n");
drivers/memory/tegra/tegra210-emc-core.c +2 -2
index e63f62690571..f12be641959a 100644
@@ -558,7 +558,7 @@ tegra210_emc_table_register_offsets = {
 
 static void tegra210_emc_train(struct timer_list *timer)
 {
-	struct tegra210_emc *emc = from_timer(emc, timer, training);
+	struct tegra210_emc *emc = timer_container_of(emc, timer, training);
 	unsigned long flags;
 
 	if (!emc->last)
@@ -614,7 +614,7 @@ static unsigned int tegra210_emc_get_temperature(struct tegra210_emc *emc)
 
 static void tegra210_emc_poll_refresh(struct timer_list *timer)
 {
-	struct tegra210_emc *emc = from_timer(emc, timer, refresh_timer);
+	struct tegra210_emc *emc = timer_container_of(emc, timer, refresh_timer);
 	unsigned int temperature;
 
 	if (!emc->debugfs.temperature)
drivers/memstick/core/ms_block.c +1 -1
index 7dc2c9987982..d34892782f6e 100644
@@ -1498,7 +1498,7 @@ static int msb_ftl_scan(struct msb_data *msb)
 
 static void msb_cache_flush_timer(struct timer_list *t)
 {
-	struct msb_data *msb = from_timer(msb, t, cache_flush_timer);
+	struct msb_data *msb = timer_container_of(msb, t, cache_flush_timer);
 
 	msb->need_flush_cache = true;
 	queue_work(msb->io_queue, &msb->io_work);
drivers/memstick/host/jmb38x_ms.c +1 -1
index a5a9bb3f16be..cddddb3a5a27 100644
@@ -590,7 +590,7 @@ static irqreturn_t jmb38x_ms_isr(int irq, void *dev_id)
 
 static void jmb38x_ms_abort(struct timer_list *t)
 {
-	struct jmb38x_ms_host *host = from_timer(host, t, timer);
+	struct jmb38x_ms_host *host = timer_container_of(host, t, timer);
 	struct memstick_host *msh = host->msh;
 	unsigned long flags;
 
drivers/memstick/host/r592.c +1 -1
index 488ef8eecb26..605b2265536f 100644
@@ -614,7 +614,7 @@ static void r592_update_card_detect(struct r592_device *dev)
 /* Timer routine that fires 1 second after last card detection event, */
 static void r592_detect_timer(struct timer_list *t)
 {
-	struct r592_device *dev = from_timer(dev, t, detect_timer);
+	struct r592_device *dev = timer_container_of(dev, t, detect_timer);
 	r592_update_card_detect(dev);
 	memstick_detect_change(dev->host);
 }
drivers/memstick/host/tifm_ms.c +1 -1
index 676348eee015..db7f3a088fb0 100644
@@ -535,7 +535,7 @@ static int tifm_ms_set_param(struct memstick_host *msh,
 
 static void tifm_ms_abort(struct timer_list *t)
 {
-	struct tifm_ms *host = from_timer(host, t, timer);
+	struct tifm_ms *host = timer_container_of(host, t, timer);
 
 	dev_dbg(&host->dev->dev, "status %x\n",
 		readl(host->dev->addr + SOCK_MS_STATUS));
drivers/misc/bcm-vk/bcm_vk_tty.c +1 -1
index 44a2dd80054d..e6c42b772e96 100644
@@ -43,7 +43,7 @@ struct bcm_vk_tty_chan {
 
 static void bcm_vk_tty_poll(struct timer_list *t)
 {
-	struct bcm_vk *vk = from_timer(vk, t, serial_timer);
+	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);
drivers/misc/cardreader/rtsx_usb.c +1 -1
index 7314c8d9ae75..148107a4547c 100644
@@ -31,7 +31,7 @@ static const struct mfd_cell rtsx_usb_cells[] = {
 
 static void rtsx_usb_sg_timed_out(struct timer_list *t)
 {
-	struct rtsx_ucr *ucr = from_timer(ucr, t, sg_timer);
+	struct rtsx_ucr *ucr = timer_container_of(ucr, t, sg_timer);
 
 	dev_dbg(&ucr->pusb_intf->dev, "%s: sg transfer timed out", __func__);
 	usb_sg_cancel(&ucr->current_sg);
drivers/misc/sgi-xp/xpc_main.c +1 -1
index 697a008c14d3..ef34483ee8e2 100644
@@ -164,7 +164,7 @@ struct xpc_arch_operations xpc_arch_ops;
 static void
 xpc_timeout_partition_disengage(struct timer_list *t)
 {
-	struct xpc_partition *part = from_timer(part, t, disengage_timer);
+	struct xpc_partition *part = timer_container_of(part, t, disengage_timer);
 
 	DBUG_ON(time_is_after_jiffies(part->disengage_timeout));
 
drivers/misc/sgi-xp/xpc_partition.c +2 -2
index d0467010558c..f983885d57e9 100644
@@ -263,7 +263,7 @@ xpc_get_remote_rp(int nasid, unsigned long *discovered_nasids,
  * to us, we really only need to wait for the other side to disengage from us.
  */
 static int __xpc_partition_disengaged(struct xpc_partition *part,
-				      bool from_timer)
+				      bool timer_container_of)
 {
 	short partid = XPC_PARTID(part);
 	int disengaged;
@@ -290,7 +290,7 @@ static int __xpc_partition_disengaged(struct xpc_partition *part,
 		part->disengage_timeout = 0;
 
 		/* Cancel the timer function if not called from it */
-		if (!from_timer)
+		if (!timer_container_of)
 			timer_delete_sync(&part->disengage_timer);
 
 		DBUG_ON(part->act_state != XPC_P_AS_DEACTIVATING &&
drivers/mmc/core/host.c +1 -1
index dacb5bd9bb71..f14671ea5716 100644
@@ -212,7 +212,7 @@ int mmc_retune(struct mmc_host *host)
 
 static void mmc_retune_timer(struct timer_list *t)
 {
-	struct mmc_host *host = from_timer(host, t, retune_timer);
+	struct mmc_host *host = timer_container_of(host, t, retune_timer);
 
 	mmc_retune_needed(host);
 }
drivers/mmc/host/atmel-mci.c +2 -2
index 14e981b834b6..2179ea085e84 100644
@@ -714,7 +714,7 @@ static inline unsigned int atmci_convert_chksize(struct atmel_mci *host,
 
 static void atmci_timeout_timer(struct timer_list *t)
 {
-	struct atmel_mci *host = from_timer(host, t, timer);
+	struct atmel_mci *host = timer_container_of(host, t, timer);
 	struct device *dev = host->dev;
 
 	dev_dbg(dev, "software timeout\n");
@@ -1652,7 +1652,7 @@ static void atmci_command_complete(struct atmel_mci *host,
 
 static void atmci_detect_change(struct timer_list *t)
 {
-	struct atmel_mci_slot	*slot = from_timer(slot, t, detect_timer);
+	struct atmel_mci_slot	*slot = timer_container_of(slot, t, detect_timer);
 	bool			present;
 	bool			present_old;
 
drivers/mmc/host/dw_mmc.c +3 -3
index 578290015e5b..a291c57893c9 100644
@@ -3179,7 +3179,7 @@ static void dw_mci_init_dma(struct dw_mci *host)
 
 static void dw_mci_cmd11_timer(struct timer_list *t)
 {
-	struct dw_mci *host = from_timer(host, t, cmd11_timer);
+	struct dw_mci *host = timer_container_of(host, t, cmd11_timer);
 
 	if (host->state != STATE_SENDING_CMD11) {
 		dev_warn(host->dev, "Unexpected CMD11 timeout\n");
@@ -3193,7 +3193,7 @@ static void dw_mci_cmd11_timer(struct timer_list *t)
 
 static void dw_mci_cto_timer(struct timer_list *t)
 {
-	struct dw_mci *host = from_timer(host, t, cto_timer);
+	struct dw_mci *host = timer_container_of(host, t, cto_timer);
 	unsigned long irqflags;
 	u32 pending;
 
@@ -3248,7 +3248,7 @@ static void dw_mci_cto_timer(struct timer_list *t)
 
 static void dw_mci_dto_timer(struct timer_list *t)
 {
-	struct dw_mci *host = from_timer(host, t, dto_timer);
+	struct dw_mci *host = timer_container_of(host, t, dto_timer);
 	unsigned long irqflags;
 	u32 pending;
 
drivers/mmc/host/jz4740_mmc.c +1 -1
index bd1662e275d4..740bcdf92be0 100644
@@ -641,7 +641,7 @@ static bool jz4740_mmc_read_data(struct jz4740_mmc_host *host,
 
 static void jz4740_mmc_timeout(struct timer_list *t)
 {
-	struct jz4740_mmc_host *host = from_timer(host, t, timeout_timer);
+	struct jz4740_mmc_host *host = timer_container_of(host, t, timeout_timer);
 
 	if (!test_and_clear_bit(0, &host->waiting))
 		return;
drivers/mmc/host/meson-mx-sdio.c +1 -1
index e0ae5a0c9670..939f4337bc55 100644
@@ -467,7 +467,7 @@ static irqreturn_t meson_mx_mmc_irq_thread(int irq, void *irq_data)
 
 static void meson_mx_mmc_timeout(struct timer_list *t)
 {
-	struct meson_mx_mmc_host *host = from_timer(host, t, cmd_timeout);
+	struct meson_mx_mmc_host *host = timer_container_of(host, t, cmd_timeout);
 	unsigned long irqflags;
 	u32 irqc;
 
drivers/mmc/host/mvsdio.c +1 -1
index 912ffacbad88..101f36de7b63 100644
@@ -509,7 +509,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
 
 static void mvsd_timeout_timer(struct timer_list *t)
 {
-	struct mvsd_host *host = from_timer(host, t, timer);
+	struct mvsd_host *host = timer_container_of(host, t, timer);
 	void __iomem *iobase = host->base;
 	struct mmc_request *mrq;
 	unsigned long flags;
drivers/mmc/host/mxcmmc.c +1 -1
index 95d8d40a06a8..e588e24256cc 100644
@@ -955,7 +955,7 @@ static bool filter(struct dma_chan *chan, void *param)
 
 static void mxcmci_watchdog(struct timer_list *t)
 {
-	struct mxcmci_host *host = from_timer(host, t, watchdog);
+	struct mxcmci_host *host = timer_container_of(host, t, watchdog);
 	struct mmc_request *req = host->req;
 	unsigned int stat = mxcmci_readl(host, MMC_REG_STATUS);
 
drivers/mmc/host/omap.c +3 -3
index c50617d03709..8bc0c4ea2211 100644
@@ -639,7 +639,7 @@ static void mmc_omap_abort_command(struct work_struct *work)
 static void
 mmc_omap_cmd_timer(struct timer_list *t)
 {
-	struct mmc_omap_host *host = from_timer(host, t, cmd_abort_timer);
+	struct mmc_omap_host *host = timer_container_of(host, t, cmd_abort_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&host->slot_lock, flags);
@@ -655,7 +655,7 @@ mmc_omap_cmd_timer(struct timer_list *t)
 static void
 mmc_omap_clk_timer(struct timer_list *t)
 {
-	struct mmc_omap_host *host = from_timer(host, t, clk_timer);
+	struct mmc_omap_host *host = timer_container_of(host, t, clk_timer);
 
 	mmc_omap_fclk_enable(host, 0);
 }
@@ -879,7 +879,7 @@ void omap_mmc_notify_cover_event(struct device *dev, int num, int is_closed)
 
 static void mmc_omap_cover_timer(struct timer_list *t)
 {
-	struct mmc_omap_slot *slot = from_timer(slot, t, cover_timer);
+	struct mmc_omap_slot *slot = timer_container_of(slot, t, cover_timer);
 	queue_work(system_bh_wq, &slot->cover_bh_work);
 }
 
drivers/mmc/host/sdhci.c +2 -2
index 5f78be7ae16d..c6f972636356 100644
@@ -3245,7 +3245,7 @@ static void sdhci_timeout_timer(struct timer_list *t)
 	struct sdhci_host *host;
 	unsigned long flags;
 
-	host = from_timer(host, t, timer);
+	host = timer_container_of(host, t, timer);
 
 	spin_lock_irqsave(&host->lock, flags);
 
@@ -3267,7 +3267,7 @@ static void sdhci_timeout_data_timer(struct timer_list *t)
 	struct sdhci_host *host;
 	unsigned long flags;
 
-	host = from_timer(host, t, data_timer);
+	host = timer_container_of(host, t, data_timer);
 
 	spin_lock_irqsave(&host->lock, flags);
 
drivers/mmc/host/tifm_sd.c +1 -1
index 713223f2d377..5e5ec92f80e6 100644
@@ -777,7 +777,7 @@ static void tifm_sd_end_cmd(struct work_struct *t)
 
 static void tifm_sd_abort(struct timer_list *t)
 {
-	struct tifm_sd *host = from_timer(host, t, timer);
+	struct tifm_sd *host = timer_container_of(host, t, timer);
 
 	pr_err("%s : card failed to respond for a long period of time "
 	       "(%x, %x)\n",
drivers/mmc/host/via-sdmmc.c +1 -1
index 909d80a02824..9903966c2f54 100644
@@ -937,7 +937,7 @@ static void via_sdc_timeout(struct timer_list *t)
 	struct via_crdr_mmc_host *sdhost;
 	unsigned long flags;
 
-	sdhost = from_timer(sdhost, t, timer);
+	sdhost = timer_container_of(sdhost, t, timer);
 
 	spin_lock_irqsave(&sdhost->lock, flags);
 
drivers/mmc/host/vub300.c +2 -2
index dd71e5b8e1a5..fdf5d23b1427 100644
@@ -740,7 +740,7 @@ static void vub300_deadwork_thread(struct work_struct *work)
 
 static void vub300_inactivity_timer_expired(struct timer_list *t)
 {				/* softirq */
-	struct vub300_mmc_host *vub300 = from_timer(vub300, t,
+	struct vub300_mmc_host *vub300 = timer_container_of(vub300, t,
 						    inactivity_timer);
 	if (!vub300->interface) {
 		kref_put(&vub300->kref, vub300_delete);
@@ -1180,7 +1180,7 @@ static void send_command(struct vub300_mmc_host *vub300)
  */
 static void vub300_sg_timed_out(struct timer_list *t)
 {
-	struct vub300_mmc_host *vub300 = from_timer(vub300, t,
+	struct vub300_mmc_host *vub300 = timer_container_of(vub300, t,
 						    sg_transfer_timer);
 	vub300->usb_timed_out = 1;
 	usb_sg_cancel(&vub300->sg_request);
drivers/mmc/host/wbsd.c +1 -1
index d5974b355a5a..2ae787d966de 100644
@@ -947,7 +947,7 @@ static const struct mmc_host_ops wbsd_ops = {
 
 static void wbsd_reset_ignore(struct timer_list *t)
 {
-	struct wbsd_host *host = from_timer(host, t, ignore_timer);
+	struct wbsd_host *host = timer_container_of(host, t, ignore_timer);
 
 	BUG_ON(host == NULL);
 
drivers/most/most_usb.c +1 -1
index 2199ba821922..cf5be9c449a5 100644
@@ -667,7 +667,7 @@ static void hdm_request_netinfo(struct most_interface *iface, int channel,
  */
 static void link_stat_timer_handler(struct timer_list *t)
 {
-	struct most_dev *mdev = from_timer(mdev, t, link_stat_timer);
+	struct most_dev *mdev = timer_container_of(mdev, t, link_stat_timer);
 
 	schedule_work(&mdev->poll_work_obj);
 	mdev->link_stat_timer.expires = jiffies + (2 * HZ);
drivers/mtd/sm_ftl.c +1 -1
index d28d4f1790f5..abc7b186353f 100644
@@ -993,7 +993,7 @@ static int sm_cache_flush(struct sm_ftl *ftl)
 /* flush timer, runs a second after last write */
 static void sm_cache_flush_timer(struct timer_list *t)
 {
-	struct sm_ftl *ftl = from_timer(ftl, t, timer);
+	struct sm_ftl *ftl = timer_container_of(ftl, t, timer);
 	queue_work(cache_flush_workqueue, &ftl->flush_work);
 }
 
drivers/net/arcnet/arcnet.c +1 -1
index 602e6e1adf00..882972604c82 100644
@@ -382,7 +382,7 @@ static void arcdev_setup(struct net_device *dev)
 
 static void arcnet_timer(struct timer_list *t)
 {
-	struct arcnet_local *lp = from_timer(lp, t, timer);
+	struct arcnet_local *lp = timer_container_of(lp, t, timer);
 	struct net_device *dev = lp->dev;
 
 	spin_lock_irq(&lp->lock);
drivers/net/can/grcan.c +2 -2
index adf3970f070f..c5784d9779ef 100644
@@ -806,7 +806,7 @@ static irqreturn_t grcan_interrupt(int irq, void *dev_id)
  */
 static void grcan_running_reset(struct timer_list *t)
 {
-	struct grcan_priv *priv = from_timer(priv, t, rr_timer);
+	struct grcan_priv *priv = timer_container_of(priv, t, rr_timer);
 	struct net_device *dev = priv->dev;
 	struct grcan_registers __iomem *regs = priv->regs;
 	unsigned long flags;
@@ -897,7 +897,7 @@ static inline void grcan_reset_timer(struct timer_list *timer, __u32 bitrate)
 /* Disable channels and schedule a running reset */
 static void grcan_initiate_running_reset(struct timer_list *t)
 {
-	struct grcan_priv *priv = from_timer(priv, t, hang_timer);
+	struct grcan_priv *priv = timer_container_of(priv, t, hang_timer);
 	struct net_device *dev = priv->dev;
 	struct grcan_registers __iomem *regs = priv->regs;
 	unsigned long flags;
drivers/net/can/kvaser_pciefd.c +1 -1
index cf0d51805272..ccb12b0bc9ac 100644
@@ -930,7 +930,7 @@ static int kvaser_pciefd_get_berr_counter(const struct net_device *ndev,
 
 static void kvaser_pciefd_bec_poll_timer(struct timer_list *data)
 {
-	struct kvaser_pciefd_can *can = from_timer(can, data, bec_poll_timer);
+	struct kvaser_pciefd_can *can = timer_container_of(can, data, bec_poll_timer);
 
 	kvaser_pciefd_enable_err_gen(can);
 	kvaser_pciefd_request_status(can);
drivers/net/can/sja1000/peak_pcmcia.c +1 -1
index 6c7b1c58f85f..ce18e9e56059 100644
@@ -374,7 +374,7 @@ static inline void pcan_set_can_power(struct pcan_pccard *card, int onoff)
  */
 static void pcan_led_timer(struct timer_list *t)
 {
-	struct pcan_pccard *card = from_timer(card, t, led_timer);
+	struct pcan_pccard *card = timer_container_of(card, t, led_timer);
 	struct net_device *netdev;
 	int i, up_count = 0;
 	u8 ccr;
drivers/net/can/usb/peak_usb/pcan_usb.c +1 -1
index c75df1755b3b..6b293a9056c2 100644
@@ -319,7 +319,7 @@ static int pcan_usb_write_mode(struct peak_usb_device *dev, u8 onoff)
  */
 static void pcan_usb_restart(struct timer_list *t)
 {
-	struct pcan_usb *pdev = from_timer(pdev, t, restart_timer);
+	struct pcan_usb *pdev = timer_container_of(pdev, t, restart_timer);
 	struct peak_usb_device *dev = &pdev->dev;
 
 	/* notify candev and netdev */
drivers/net/dsa/mv88e6xxx/phy.c +1 -1
index b6d249eb64e7..4e7827ee684a 100644
@@ -182,7 +182,7 @@ static void mv88e6xxx_phy_ppu_reenable_work(struct work_struct *ugly)
 
 static void mv88e6xxx_phy_ppu_reenable_timer(struct timer_list *t)
 {
-	struct mv88e6xxx_chip *chip = from_timer(chip, t, ppu_timer);
+	struct mv88e6xxx_chip *chip = timer_container_of(chip, t, ppu_timer);
 
 	schedule_work(&chip->ppu_work);
 }
drivers/net/eql.c +1 -1
index 5889759b8d83..9ba10efd3794 100644
@@ -143,7 +143,7 @@ static void eql_kill_one_slave(slave_queue_t *queue, slave_t *slave);
 
 static void eql_timer(struct timer_list *t)
 {
-	equalizer_t *eql = from_timer(eql, t, timer);
+	equalizer_t *eql = timer_container_of(eql, t, timer);
 	struct list_head *this, *tmp, *head;
 
 	spin_lock(&eql->queue.lock);
drivers/net/ethernet/3com/3c515.c +1 -1
index 8ba2ed87fe7c..ecdea58e6a21 100644
@@ -859,7 +859,7 @@ static int corkscrew_open(struct net_device *dev)
 static void corkscrew_timer(struct timer_list *t)
 {
 #ifdef AUTOMEDIA
-	struct corkscrew_private *vp = from_timer(vp, t, timer);
+	struct corkscrew_private *vp = timer_container_of(vp, t, timer);
 	struct net_device *dev = vp->our_dev;
 	int ioaddr = dev->base_addr;
 	unsigned long flags;
drivers/net/ethernet/3com/3c574_cs.c +1 -1
index b295d528a237..1f2070497a75 100644
@@ -858,7 +858,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
 */
 static void media_check(struct timer_list *t)
 {
-	struct el3_private *lp = from_timer(lp, t, media);
+	struct el3_private *lp = timer_container_of(lp, t, media);
 	struct net_device *dev = lp->p_dev->priv;
 	unsigned int ioaddr = dev->base_addr;
 	unsigned long flags;
drivers/net/ethernet/3com/3c589_cs.c +1 -1
index ff331a3bde73..ea49be43b8c3 100644
@@ -685,7 +685,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)
 
 static void media_check(struct timer_list *t)
 {
-	struct el3_private *lp = from_timer(lp, t, media);
+	struct el3_private *lp = timer_container_of(lp, t, media);
 	struct net_device *dev = lp->p_dev->priv;
 	unsigned int ioaddr = dev->base_addr;
 	u16 media, errs;
drivers/net/ethernet/3com/3c59x.c +1 -1
index 1a10f5dbc4d7..8c9cc97efd4e 100644
@@ -1783,7 +1783,7 @@ vortex_open(struct net_device *dev)
 static void
 vortex_timer(struct timer_list *t)
 {
-	struct vortex_private *vp = from_timer(vp, t, timer);
+	struct vortex_private *vp = timer_container_of(vp, t, timer);
 	struct net_device *dev = vp->mii.dev;
 	void __iomem *ioaddr = vp->ioaddr;
 	int next_tick = 60*HZ;
drivers/net/ethernet/8390/axnet_cs.c +1 -1
index e5be5044e1d4..7c8213011b5c 100644
@@ -550,7 +550,7 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id)
 
 static void ei_watchdog(struct timer_list *t)
 {
-    struct axnet_dev *info = from_timer(info, t, watchdog);
+    struct axnet_dev *info = timer_container_of(info, t, watchdog);
     struct net_device *dev = info->p_dev->priv;
     unsigned int nic_base = dev->base_addr;
     unsigned int mii_addr = nic_base + AXNET_MII_EEP;
drivers/net/ethernet/8390/pcnet_cs.c +1 -1
index a326f25dda09..19f9c5db3f3b 100644
@@ -1018,7 +1018,7 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id)
 
 static void ei_watchdog(struct timer_list *t)
 {
-    struct pcnet_dev *info = from_timer(info, t, watchdog);
+    struct pcnet_dev *info = timer_container_of(info, t, watchdog);
     struct net_device *dev = info->p_dev->priv;
     unsigned int nic_base = dev->base_addr;
     unsigned int mii_addr = nic_base + DLINK_GPIO;
drivers/net/ethernet/agere/et131x.c +1 -1
index b398adacda91..12def2cddc55 100644
@@ -3076,7 +3076,7 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
  */
 static void et131x_error_timer_handler(struct timer_list *t)
 {
-	struct et131x_adapter *adapter = from_timer(adapter, t, error_timer);
+	struct et131x_adapter *adapter = timer_container_of(adapter, t, error_timer);
 	struct phy_device *phydev = adapter->netdev->phydev;
 
 	if (et1310_in_phy_coma(adapter)) {
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
index 897720fdf5d8..e4177c7bfa88 100644
@@ -3667,7 +3667,7 @@ static void ena_update_host_info(struct ena_admin_host_info *host_info,
 
 static void ena_timer_service(struct timer_list *t)
 {
-	struct ena_adapter *adapter = from_timer(adapter, t, timer_service);
+	struct ena_adapter *adapter = timer_container_of(adapter, t, timer_service);
 	u8 *debug_area = adapter->ena_dev->host_attr.debug_area_virt_addr;
 	struct ena_admin_host_info *host_info =
 		adapter->ena_dev->host_attr.host_info;
drivers/net/ethernet/amd/a2065.c +1 -1
index b923ad9e1581..ce9445425045 100644
@@ -636,7 +636,7 @@ static void lance_set_multicast(struct net_device *dev)
 
 static void lance_set_multicast_retry(struct timer_list *t)
 {
-	struct lance_private *lp = from_timer(lp, t, multicast_timer);
+	struct lance_private *lp = timer_container_of(lp, t, multicast_timer);
 
 	lance_set_multicast(lp->dev);
 }
drivers/net/ethernet/amd/amd8111e.c +1 -1
index 86522e8574cb..f9a936ac6731 100644
@@ -1641,7 +1641,7 @@ static int __maybe_unused amd8111e_resume(struct device *dev_d)
 
 static void amd8111e_config_ipg(struct timer_list *t)
 {
-	struct amd8111e_priv *lp = from_timer(lp, t, ipg_data.ipg_timer);
+	struct amd8111e_priv *lp = timer_container_of(lp, t, ipg_data.ipg_timer);
 	struct ipg_info *ipg_data = &lp->ipg_data;
 	void __iomem *mmio = lp->mmio;
 	unsigned int prev_col_cnt = ipg_data->col_cnt;
drivers/net/ethernet/amd/declance.c +1 -1
index b072ca5930fc..8d05a0c5f2d5 100644
@@ -1004,7 +1004,7 @@ static void lance_set_multicast(struct net_device *dev)
 
 static void lance_set_multicast_retry(struct timer_list *t)
 {
-	struct lance_private *lp = from_timer(lp, t, multicast_timer);
+	struct lance_private *lp = timer_container_of(lp, t, multicast_timer);
 	struct net_device *dev = lp->dev;
 
 	lance_set_multicast(dev);
drivers/net/ethernet/amd/pcnet32.c +1 -1
index e5adafecc686..9eaefa0f5e80 100644
@@ -2905,7 +2905,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
 
 static void pcnet32_watchdog(struct timer_list *t)
 {
-	struct pcnet32_private *lp = from_timer(lp, t, watchdog_timer);
+	struct pcnet32_private *lp = timer_container_of(lp, t, watchdog_timer);
 	struct net_device *dev = lp->dev;
 	unsigned long flags;
 
drivers/net/ethernet/amd/pds_core/main.c +1 -1
index 4843f9249a31..9b81e1c260c2 100644
@@ -23,7 +23,7 @@ MODULE_DEVICE_TABLE(pci, pdsc_id_table);
 
 static void pdsc_wdtimer_cb(struct timer_list *t)
 {
-	struct pdsc *pdsc = from_timer(pdsc, t, wdtimer);
+	struct pdsc *pdsc = timer_container_of(pdsc, t, wdtimer);
 
 	dev_dbg(pdsc->dev, "%s: jiffies %ld\n", __func__, jiffies);
 	mod_timer(&pdsc->wdtimer,
drivers/net/ethernet/amd/sunlance.c +1 -1
index 3cd31855a5f6..0b273327f5a6 100644
@@ -1246,7 +1246,7 @@ static void lance_set_multicast(struct net_device *dev)
 
 static void lance_set_multicast_retry(struct timer_list *t)
 {
-	struct lance_private *lp = from_timer(lp, t, multicast_timer);
+	struct lance_private *lp = timer_container_of(lp, t, multicast_timer);
 	struct net_device *dev = lp->dev;
 
 	lance_set_multicast(dev);
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +2 -2
index d84a310dfcd4..91f19eb286cd 100644
@@ -643,7 +643,7 @@ static irqreturn_t xgbe_dma_isr(int irq, void *data)
 
 static void xgbe_tx_timer(struct timer_list *t)
 {
-	struct xgbe_channel *channel = from_timer(channel, t, tx_timer);
+	struct xgbe_channel *channel = timer_container_of(channel, t, tx_timer);
 	struct xgbe_prv_data *pdata = channel->pdata;
 	struct napi_struct *napi;
 
@@ -681,7 +681,7 @@ static void xgbe_service(struct work_struct *work)
 
 static void xgbe_service_timer(struct timer_list *t)
 {
-	struct xgbe_prv_data *pdata = from_timer(pdata, t, service_timer);
+	struct xgbe_prv_data *pdata = timer_container_of(pdata, t, service_timer);
 	struct xgbe_channel *channel;
 	unsigned int i;
 
drivers/net/ethernet/apple/bmac.c +1 -1
index b9fdd61f1fdb..afaebc58d986 100644
@@ -1466,7 +1466,7 @@ bmac_output(struct sk_buff *skb, struct net_device *dev)
 
 static void bmac_tx_timeout(struct timer_list *t)
 {
-	struct bmac_data *bp = from_timer(bp, t, tx_timeout);
+	struct bmac_data *bp = timer_container_of(bp, t, tx_timeout);
 	struct net_device *dev = macio_get_drvdata(bp->mdev);
 	volatile struct dbdma_regs __iomem *td = bp->tx_dma;
 	volatile struct dbdma_regs __iomem *rd = bp->rx_dma;
drivers/net/ethernet/apple/mace.c +1 -1
index 1fed112f4e68..af26905e44e3 100644
@@ -805,7 +805,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
 
 static void mace_tx_timeout(struct timer_list *t)
 {
-    struct mace_data *mp = from_timer(mp, t, tx_timeout);
+    struct mace_data *mp = timer_container_of(mp, t, tx_timeout);
     struct net_device *dev = macio_get_drvdata(mp->mdev);
     volatile struct mace __iomem *mb = mp->mace;
     volatile struct dbdma_regs __iomem *td = mp->tx_dma;
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +2 -2
index bf3aa46887a1..99b124e40bdc 100644
@@ -254,7 +254,7 @@ static void aq_nic_service_task(struct work_struct *work)
 
 static void aq_nic_service_timer_cb(struct timer_list *t)
 {
-	struct aq_nic_s *self = from_timer(self, t, service_timer);
+	struct aq_nic_s *self = timer_container_of(self, t, service_timer);
 
 	mod_timer(&self->service_timer,
 		  jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);
@@ -264,7 +264,7 @@ static void aq_nic_service_timer_cb(struct timer_list *t)
 
 static void aq_nic_polling_timer_cb(struct timer_list *t)
 {
-	struct aq_nic_s *self = from_timer(self, t, polling_timer);
+	struct aq_nic_s *self = timer_container_of(self, t, polling_timer);
 	unsigned int i = 0U;
 
 	for (i = 0U; self->aq_vecs > i; ++i)
drivers/net/ethernet/atheros/ag71xx.c +1 -1
index 67b654889cae..d8e6f23e1432 100644
@@ -1563,7 +1563,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
 
 static void ag71xx_oom_timer_handler(struct timer_list *t)
 {
-	struct ag71xx *ag = from_timer(ag, t, oom_timer);
+	struct ag71xx *ag = timer_container_of(ag, t, oom_timer);
 
 	napi_schedule(&ag->napi);
 }
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1 -1
index 82137f9deae9..19ef52ff6fe3 100644
@@ -231,7 +231,7 @@ static u32 atl1c_wait_until_idle(struct atl1c_hw *hw, u32 modu_ctrl)
  */
 static void atl1c_phy_config(struct timer_list *t)
 {
-	struct atl1c_adapter *adapter = from_timer(adapter, t,
+	struct atl1c_adapter *adapter = timer_container_of(adapter, t,
 						   phy_config_timer);
 	struct atl1c_hw *hw = &adapter->hw;
 	unsigned long flags;
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +1 -1
index f664a0edbc49..11c26e82f471 100644
@@ -115,7 +115,7 @@ static inline void atl1e_irq_reset(struct atl1e_adapter *adapter)
  */
 static void atl1e_phy_config(struct timer_list *t)
 {
-	struct atl1e_adapter *adapter = from_timer(adapter, t,
+	struct atl1e_adapter *adapter = timer_container_of(adapter, t,
 						   phy_config_timer);
 	struct atl1e_hw *hw = &adapter->hw;
 	unsigned long flags;
drivers/net/ethernet/atheros/atlx/atl1.c +1 -1
index 38cd84b7677c..6ad73d93a247 100644
@@ -2556,7 +2556,7 @@ static irqreturn_t atl1_intr(int irq, void *data)
  */
 static void atl1_phy_config(struct timer_list *t)
 {
-	struct atl1_adapter *adapter = from_timer(adapter, t,
+	struct atl1_adapter *adapter = timer_container_of(adapter, t,
 						  phy_config_timer);
 	struct atl1_hw *hw = &adapter->hw;
 	unsigned long flags;
drivers/net/ethernet/atheros/atlx/atl2.c +2 -2
index 88f65f8cf4d3..b46a6a0fc7e4 100644
@@ -1010,7 +1010,7 @@ static void atl2_tx_timeout(struct net_device *netdev, unsigned int txqueue)
  */
 static void atl2_watchdog(struct timer_list *t)
 {
-	struct atl2_adapter *adapter = from_timer(adapter, t, watchdog_timer);
+	struct atl2_adapter *adapter = timer_container_of(adapter, t, watchdog_timer);
 
 	if (!test_bit(__ATL2_DOWN, &adapter->flags)) {
 		u32 drop_rxd, drop_rxs;
@@ -1035,7 +1035,7 @@ static void atl2_watchdog(struct timer_list *t)
  */
 static void atl2_phy_config(struct timer_list *t)
 {
-	struct atl2_adapter *adapter = from_timer(adapter, t,
+	struct atl2_adapter *adapter = timer_container_of(adapter, t,
 						  phy_config_timer);
 	struct atl2_hw *hw = &adapter->hw;
 	unsigned long flags;
drivers/net/ethernet/broadcom/b44.c +1 -1
index c91884373429..8267417b3750 100644
@@ -575,7 +575,7 @@ static void b44_check_phy(struct b44 *bp)
 
 static void b44_timer(struct timer_list *t)
 {
-	struct b44 *bp = from_timer(bp, t, timer);
+	struct b44 *bp = timer_container_of(bp, t, timer);
 
 	spin_lock_irq(&bp->lock);
 
drivers/net/ethernet/broadcom/bcm63xx_enet.c +2 -2
index 19611bdd86e6..92204fea1f08 100644
@@ -286,7 +286,7 @@ static int bcm_enet_refill_rx(struct net_device *dev, bool napi_mode)
  */
 static void bcm_enet_refill_rx_timer(struct timer_list *t)
 {
-	struct bcm_enet_priv *priv = from_timer(priv, t, rx_timeout);
+	struct bcm_enet_priv *priv = timer_container_of(priv, t, rx_timeout);
 	struct net_device *dev = priv->net_dev;
 
 	spin_lock(&priv->rx_lock);
@@ -2001,7 +2001,7 @@ static inline int bcm_enet_port_is_rgmii(int portid)
  */
 static void swphy_poll_timer(struct timer_list *t)
 {
-	struct bcm_enet_priv *priv = from_timer(priv, t, swphy_poll);
+	struct bcm_enet_priv *priv = timer_container_of(priv, t, swphy_poll);
 	unsigned int i;
 
 	for (i = 0; i < priv->num_ports; i++) {
drivers/net/ethernet/broadcom/bnx2.c +1 -1
index ec0c9584f3bb..cb1011f6fd30 100644
@@ -6163,7 +6163,7 @@ bnx2_5708_serdes_timer(struct bnx2 *bp)
 static void
 bnx2_timer(struct timer_list *t)
 {
-	struct bnx2 *bp = from_timer(bp, t, timer);
+	struct bnx2 *bp = timer_container_of(bp, t, timer);
 
 	if (!netif_running(bp->dev))
 		return;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
index f522ca8ff66b..c9a1a1d504c0 100644
@@ -5783,7 +5783,7 @@ void bnx2x_drv_pulse(struct bnx2x *bp)
 
 static void bnx2x_timer(struct timer_list *t)
 {
-	struct bnx2x *bp = from_timer(bp, t, timer);
+	struct bnx2x *bp = timer_container_of(bp, t, timer);
 
 	if (!netif_running(bp->dev))
 		return;
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
index 8725e1e13908..f181c72df902 100644
@@ -13950,7 +13950,7 @@ static void bnxt_fw_health_check(struct bnxt *bp)
 
 static void bnxt_timer(struct timer_list *t)
 {
-	struct bnxt *bp = from_timer(bp, t, timer);
+	struct bnxt *bp = timer_container_of(bp, t, timer);
 	struct net_device *dev = bp->dev;
 
 	if (!netif_running(dev) || !test_bit(BNXT_STATE_OPEN, &bp->state))
drivers/net/ethernet/broadcom/tg3.c +1 -1
index d1f541af4e3b..abbf81f06aa0 100644
@@ -11081,7 +11081,7 @@ static void tg3_chk_missed_msi(struct tg3 *tp)
 
 static void tg3_timer(struct timer_list *t)
 {
-	struct tg3 *tp = from_timer(tp, t, timer);
+	struct tg3 *tp = timer_container_of(tp, t, timer);
 
 	spin_lock(&tp->lock);
 
drivers/net/ethernet/brocade/bna/bnad.c +6 -6
index a03eff3d4425..93e8fd762769 100644
@@ -1688,7 +1688,7 @@ bnad_rx_res_alloc(struct bnad *bnad, struct bna_res_info *res_info,
 static void
 bnad_ioc_timeout(struct timer_list *t)
 {
-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.ioc_timer);
+	struct bnad *bnad = timer_container_of(bnad, t, bna.ioceth.ioc.ioc_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&bnad->bna_lock, flags);
@@ -1699,7 +1699,7 @@ bnad_ioc_timeout(struct timer_list *t)
 static void
 bnad_ioc_hb_check(struct timer_list *t)
 {
-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.hb_timer);
+	struct bnad *bnad = timer_container_of(bnad, t, bna.ioceth.ioc.hb_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&bnad->bna_lock, flags);
@@ -1710,7 +1710,7 @@ bnad_ioc_hb_check(struct timer_list *t)
 static void
 bnad_iocpf_timeout(struct timer_list *t)
 {
-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.iocpf_timer);
+	struct bnad *bnad = timer_container_of(bnad, t, bna.ioceth.ioc.iocpf_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&bnad->bna_lock, flags);
@@ -1721,7 +1721,7 @@ bnad_iocpf_timeout(struct timer_list *t)
 static void
 bnad_iocpf_sem_timeout(struct timer_list *t)
 {
-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.sem_timer);
+	struct bnad *bnad = timer_container_of(bnad, t, bna.ioceth.ioc.sem_timer);
 	unsigned long flags;
 
 	spin_lock_irqsave(&bnad->bna_lock, flags);
@@ -1743,7 +1743,7 @@ bnad_iocpf_sem_timeout(struct timer_list *t)
 static void
 bnad_dim_timeout(struct timer_list *t)
 {
-	struct bnad *bnad = from_timer(bnad, t, dim_timer);
+	struct bnad *bnad = timer_container_of(bnad, t, dim_timer);
 	struct bnad_rx_info *rx_info;
 	struct bnad_rx_ctrl *rx_ctrl;
 	int i, j;
@@ -1776,7 +1776,7 @@ bnad_dim_timeout(struct timer_list *t)
 static void
 bnad_stats_timeout(struct timer_list *t)
 {
-	struct bnad *bnad = from_timer(bnad, t, stats_timer);
+	struct bnad *bnad = timer_container_of(bnad, t, stats_timer);
 	unsigned long flags;
 
 	if (!netif_running(bnad->netdev) ||
drivers/net/ethernet/chelsio/cxgb/sge.c +3 -3
index a10923c7e25c..5f354cf62cdd 100644
@@ -1922,7 +1922,7 @@ netdev_tx_t t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static void sge_tx_reclaim_cb(struct timer_list *t)
 {
 	int i;
-	struct sge *sge = from_timer(sge, t, tx_reclaim_timer);
+	struct sge *sge = timer_container_of(sge, t, tx_reclaim_timer);
 
 	for (i = 0; i < SGE_CMDQ_N; ++i) {
 		struct cmdQ *q = &sge->cmdQ[i];
@@ -2017,7 +2017,7 @@ void t1_sge_start(struct sge *sge)
  */
 static void espibug_workaround_t204(struct timer_list *t)
 {
-	struct sge *sge = from_timer(sge, t, espibug_timer);
+	struct sge *sge = timer_container_of(sge, t, espibug_timer);
 	struct adapter *adapter = sge->adapter;
 	unsigned int nports = adapter->params.nports;
 	u32 seop[MAX_NPORTS];
@@ -2060,7 +2060,7 @@ static void espibug_workaround_t204(struct timer_list *t)
 
 static void espibug_workaround(struct timer_list *t)
 {
-	struct sge *sge = from_timer(sge, t, espibug_timer);
+	struct sge *sge = timer_container_of(sge, t, espibug_timer);
 	struct adapter *adapter = sge->adapter;
 
 	if (netif_running(adapter->port[0].dev)) {
drivers/net/ethernet/chelsio/cxgb3/sge.c +2 -2
index bd5c3b3fa5e3..b59735d0e065 100644
@@ -2906,7 +2906,7 @@ void t3_sge_err_intr_handler(struct adapter *adapter)
  */
 static void sge_timer_tx(struct timer_list *t)
 {
-	struct sge_qset *qs = from_timer(qs, t, tx_reclaim_timer);
+	struct sge_qset *qs = timer_container_of(qs, t, tx_reclaim_timer);
 	struct port_info *pi = netdev_priv(qs->netdev);
 	struct adapter *adap = pi->adapter;
 	unsigned int tbd[SGE_TXQ_PER_SET] = {0, 0};
@@ -2947,7 +2947,7 @@ static void sge_timer_tx(struct timer_list *t)
 static void sge_timer_rx(struct timer_list *t)
 {
 	spinlock_t *lock;
-	struct sge_qset *qs = from_timer(qs, t, rx_reclaim_timer);
+	struct sge_qset *qs = timer_container_of(qs, t, rx_reclaim_timer);
 	struct port_info *pi = netdev_priv(qs->netdev);
 	struct adapter *adap = pi->adapter;
 	u32 status;
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c +1 -1
index 69d045d769c4..0765d000eaef 100644
@@ -1051,7 +1051,7 @@ static void ch_flower_stats_handler(struct work_struct *work)
 
 static void ch_flower_stats_cb(struct timer_list *t)
 {
-	struct adapter *adap = from_timer(adap, t, flower_stats_timer);
+	struct adapter *adap = timer_container_of(adap, t, flower_stats_timer);
 
 	schedule_work(&adap->flower_stats_work);
 }
drivers/net/ethernet/chelsio/cxgb4/sge.c +2 -2
index f991a28a71c3..ecd53235dc9d 100644
@@ -4233,7 +4233,7 @@ static void sge_rx_timer_cb(struct timer_list *t)
 {
 	unsigned long m;
 	unsigned int i;
-	struct adapter *adap = from_timer(adap, t, sge.rx_timer);
+	struct adapter *adap = timer_container_of(adap, t, sge.rx_timer);
 	struct sge *s = &adap->sge;
 
 	for (i = 0; i < BITS_TO_LONGS(s->egr_sz); i++)
@@ -4268,7 +4268,7 @@ static void sge_rx_timer_cb(struct timer_list *t)
 
 static void sge_tx_timer_cb(struct timer_list *t)
 {
-	struct adapter *adap = from_timer(adap, t, sge.tx_timer);
+	struct adapter *adap = timer_container_of(adap, t, sge.tx_timer);
 	struct sge *s = &adap->sge;
 	unsigned long m, period;
 	unsigned int i, budget;
drivers/net/ethernet/chelsio/cxgb4vf/sge.c +2 -2
index f42af01f4114..4e6ecb9c8dcc 100644
@@ -2062,7 +2062,7 @@ irq_handler_t t4vf_intr_handler(struct adapter *adapter)
  */
 static void sge_rx_timer_cb(struct timer_list *t)
 {
-	struct adapter *adapter = from_timer(adapter, t, sge.rx_timer);
+	struct adapter *adapter = timer_container_of(adapter, t, sge.rx_timer);
 	struct sge *s = &adapter->sge;
 	unsigned int i;
 
@@ -2121,7 +2121,7 @@ static void sge_rx_timer_cb(struct timer_list *t)
  */
 static void sge_tx_timer_cb(struct timer_list *t)
 {
-	struct adapter *adapter = from_timer(adapter, t, sge.tx_timer);
+	struct adapter *adapter = timer_container_of(adapter, t, sge.tx_timer);
 	struct sge *s = &adapter->sge;
 	unsigned int i, budget;
 
drivers/net/ethernet/cisco/enic/enic_clsf.c +1 -1
index 9900993b6aea..837f954873ee 100644
@@ -125,7 +125,7 @@ struct enic_rfs_fltr_node *htbl_fltr_search(struct enic *enic, u16 fltr_id)
 #ifdef CONFIG_RFS_ACCEL
 void enic_flow_may_expire(struct timer_list *t)
 {
-	struct enic *enic = from_timer(enic, t, rfs_h.rfs_may_expire);
+	struct enic *enic = timer_container_of(enic, t, rfs_h.rfs_may_expire);
 	bool res;
 	int j;
 
drivers/net/ethernet/cisco/enic/enic_main.c +1 -1
index c753c35b26eb..8f933bdd1c81 100644
@@ -1510,7 +1510,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)
 
 static void enic_notify_timer(struct timer_list *t)
 {
-	struct enic *enic = from_timer(enic, t, notify_timer);
+	struct enic *enic = timer_container_of(enic, t, notify_timer);
 
 	enic_notify_check(enic);
 
drivers/net/ethernet/dec/tulip/de2104x.c +2 -2
index f9339d0772b5..f9504f340c4a 100644
@@ -963,7 +963,7 @@ static void de_next_media (struct de_private *de, const u32 *media,
 
 static void de21040_media_timer (struct timer_list *t)
 {
-	struct de_private *de = from_timer(de, t, media_timer);
+	struct de_private *de = timer_container_of(de, t, media_timer);
 	struct net_device *dev = de->dev;
 	u32 status = dr32(SIAStatus);
 	unsigned int carrier;
@@ -1044,7 +1044,7 @@ static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)
 
 static void de21041_media_timer (struct timer_list *t)
 {
-	struct de_private *de = from_timer(de, t, media_timer);
+	struct de_private *de = timer_container_of(de, t, media_timer);
 	struct net_device *dev = de->dev;
 	u32 status = dr32(SIAStatus);
 	unsigned int carrier;
drivers/net/ethernet/dec/tulip/dmfe.c +1 -1
index ae34b95ed676..2d3bd343b6e6 100644
@@ -1115,7 +1115,7 @@ static const struct ethtool_ops netdev_ethtool_ops = {
 
 static void dmfe_timer(struct timer_list *t)
 {
-	struct dmfe_board_info *db = from_timer(db, t, timer);
+	struct dmfe_board_info *db = timer_container_of(db, t, timer);
 	struct net_device *dev = pci_get_drvdata(db->pdev);
 	void __iomem *ioaddr = db->ioaddr;
 	u32 tmp_cr8;
drivers/net/ethernet/dec/tulip/interrupt.c +1 -1
index 2d926a26fbb9..0a12cb9b3ba7 100644
@@ -104,7 +104,7 @@ int tulip_refill_rx(struct net_device *dev)
 
 void oom_timer(struct timer_list *t)
 {
-	struct tulip_private *tp = from_timer(tp, t, oom_timer);
+	struct tulip_private *tp = timer_container_of(tp, t, oom_timer);
 
 	napi_schedule(&tp->napi);
 }
drivers/net/ethernet/dec/tulip/pnic.c +1 -1
index 653bde48ef44..1de5ed967070 100644
@@ -86,7 +86,7 @@ void pnic_lnk_change(struct net_device *dev, int csr5)
 
 void pnic_timer(struct timer_list *t)
 {
-	struct tulip_private *tp = from_timer(tp, t, timer);
+	struct tulip_private *tp = timer_container_of(tp, t, timer);
 	struct net_device *dev = tp->dev;
 	void __iomem *ioaddr = tp->base_addr;
 	int next_tick = 60*HZ;
drivers/net/ethernet/dec/tulip/pnic2.c +1 -1
index 2e3bdc0fcdc0..39c410bf224e 100644
@@ -78,7 +78,7 @@
 
 void pnic2_timer(struct timer_list *t)
 {
-	struct tulip_private *tp = from_timer(tp, t, timer);
+	struct tulip_private *tp = timer_container_of(tp, t, timer);
 	struct net_device *dev = tp->dev;
 	void __iomem *ioaddr = tp->base_addr;
 	int next_tick = 60*HZ;
drivers/net/ethernet/dec/tulip/timer.c +2 -2
index 642e9dfc5451..ca0c509b601c 100644
@@ -139,7 +139,7 @@ void tulip_media_task(struct work_struct *work)
 
 void mxic_timer(struct timer_list *t)
 {
-	struct tulip_private *tp = from_timer(tp, t, timer);
+	struct tulip_private *tp = timer_container_of(tp, t, timer);
 	struct net_device *dev = tp->dev;
 	void __iomem *ioaddr = tp->base_addr;
 	int next_tick = 60*HZ;
@@ -156,7 +156,7 @@ void mxic_timer(struct timer_list *t)
 
 void comet_timer(struct timer_list *t)
 {
-	struct tulip_private *tp = from_timer(tp, t, timer);
+	struct tulip_private *tp = timer_container_of(tp, t, timer);
 	struct net_device *dev = tp->dev;
 	int next_tick = 2*HZ;
 
drivers/net/ethernet/dec/tulip/tulip_core.c +1 -1
index c8c53121557f..cd3da0e9a183 100644
@@ -114,7 +114,7 @@ int tulip_debug = 1;
 
 static void tulip_timer(struct timer_list *t)
 {
-	struct tulip_private *tp = from_timer(tp, t, timer);
+	struct tulip_private *tp = timer_container_of(tp, t, timer);
 	struct net_device *dev = tp->dev;
 
 	if (netif_running(dev))
drivers/net/ethernet/dec/tulip/uli526x.c +1 -1
index 3f1bd670700b..6e4d8d31aba9 100644
@@ -1014,7 +1014,7 @@ static const struct ethtool_ops netdev_ethtool_ops = {
 
 static void uli526x_timer(struct timer_list *t)
 {
-	struct uli526x_board_info *db = from_timer(db, t, timer);
+	struct uli526x_board_info *db = timer_container_of(db, t, timer);
 	struct net_device *dev = pci_get_drvdata(db->pdev);
 	struct uli_phy_ops *phy = &db->phy;
 	void __iomem *ioaddr = db->ioaddr;
drivers/net/ethernet/dec/tulip/winbond-840.c +1 -1
index 5930cdec6f2f..ded7d1855e0f 100644
@@ -763,7 +763,7 @@ static inline void update_csr6(struct net_device *dev, int new)
 
 static void netdev_timer(struct timer_list *t)
 {
-	struct netdev_private *np = from_timer(np, t, timer);
+	struct netdev_private *np = timer_container_of(np, t, timer);
 	struct net_device *dev = pci_get_drvdata(np->pci_dev);
 	void __iomem *ioaddr = np->base_addr;
 
drivers/net/ethernet/dlink/dl2k.c +1 -1
index d88fbecdab4b..dc1ff862e04b 100644
@@ -648,7 +648,7 @@ static int rio_open(struct net_device *dev)
 static void
 rio_timer (struct timer_list *t)
 {
-	struct netdev_private *np = from_timer(np, t, timer);
+	struct netdev_private *np = timer_container_of(np, t, timer);
 	struct net_device *dev = pci_get_drvdata(np->pdev);
 	unsigned int entry;
 	int next_tick = 1*HZ;
drivers/net/ethernet/fealnx.c +2 -2
index 670b68201376..6ac8547ef9b8 100644
@@ -1074,7 +1074,7 @@ static void allocate_rx_buffers(struct net_device *dev)
 
 static void netdev_timer(struct timer_list *t)
 {
-	struct netdev_private *np = from_timer(np, t, timer);
+	struct netdev_private *np = timer_container_of(np, t, timer);
 	struct net_device *dev = np->mii.dev;
 	void __iomem *ioaddr = np->mem;
 	int old_crvalue = np->crvalue;
@@ -1163,7 +1163,7 @@ static void enable_rxtx(struct net_device *dev)
 
 static void reset_timer(struct timer_list *t)
 {
-	struct netdev_private *np = from_timer(np, t, reset_timer);
+	struct netdev_private *np = timer_container_of(np, t, reset_timer);
 	struct net_device *dev = np->mii.dev;
 	unsigned long flags;
 
drivers/net/ethernet/google/gve/gve_main.c +1 -1
index c3791cf23c87..27f34dfa0390 100644
@@ -268,7 +268,7 @@ static void gve_stats_report_schedule(struct gve_priv *priv)
 
 static void gve_stats_report_timer(struct timer_list *t)
 {
-	struct gve_priv *priv = from_timer(priv, t, stats_report_timer);
+	struct gve_priv *priv = timer_container_of(priv, t, stats_report_timer);
 
 	mod_timer(&priv->stats_report_timer,
 		  round_jiffies(jiffies +
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
index d98f8d3ce7c8..e905f10b894e 100644
@@ -2075,7 +2075,7 @@ static void hns_nic_task_schedule(struct hns_nic_priv *priv)
 
 static void hns_nic_service_timer(struct timer_list *t)
 {
-	struct hns_nic_priv *priv = from_timer(priv, t, service_timer);
+	struct hns_nic_priv *priv = timer_container_of(priv, t, service_timer);
 
 	(void)mod_timer(&priv->service_timer, jiffies + SERVICE_TIMER_HZ);
 
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
index 3e28a08934ab..a7de67699a01 100644
@@ -4503,7 +4503,7 @@ static void hclge_set_def_reset_request(struct hnae3_ae_dev *ae_dev,
 
 static void hclge_reset_timer(struct timer_list *t)
 {
-	struct hclge_dev *hdev = from_timer(hdev, t, reset_timer);
+	struct hclge_dev *hdev = timer_container_of(hdev, t, reset_timer);
 
 	/* if default_reset_request has no value, it means that this reset
 	 * request has already be handled, so just return here
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +1 -1
index 9ba767740a04..5b02fe91f073 100644
@@ -2045,7 +2045,7 @@ static enum hclgevf_evt_cause hclgevf_check_evt_cause(struct hclgevf_dev *hdev,
 
 static void hclgevf_reset_timer(struct timer_list *t)
 {
-	struct hclgevf_dev *hdev = from_timer(hdev, t, reset_timer);
+	struct hclgevf_dev *hdev = timer_container_of(hdev, t, reset_timer);
 
 	hclgevf_clear_event_cause(hdev, HCLGEVF_VECTOR0_EVENT_RST);
 	hclgevf_reset_task_schedule(hdev);
drivers/net/ethernet/intel/e100.c +1 -1
index c0ead54ea186..5c56c1edd492 100644
@@ -1682,7 +1682,7 @@ static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex)
 
 static void e100_watchdog(struct timer_list *t)
 {
-	struct nic *nic = from_timer(nic, t, watchdog);
+	struct nic *nic = timer_container_of(nic, t, watchdog);
 	struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
 	u32 speed;
 
drivers/net/ethernet/intel/e1000e/netdev.c +2 -2
index 8ebcb6a7d608..b6a39f691581 100644
@@ -4839,7 +4839,7 @@ static void e1000e_update_phy_task(struct work_struct *work)
  **/
 static void e1000_update_phy_info(struct timer_list *t)
 {
-	struct e1000_adapter *adapter = from_timer(adapter, t, phy_info_timer);
+	struct e1000_adapter *adapter = timer_container_of(adapter, t, phy_info_timer);
 
 	if (test_bit(__E1000_DOWN, &adapter->state))
 		return;
@@ -5175,7 +5175,7 @@ static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
  **/
 static void e1000_watchdog(struct timer_list *t)
 {
-	struct e1000_adapter *adapter = from_timer(adapter, t, watchdog_timer);
+	struct e1000_adapter *adapter = timer_container_of(adapter, t, watchdog_timer);
 
 	/* Do the rest outside of interrupt context */
 	schedule_work(&adapter->watchdog_task);
drivers/net/ethernet/intel/fm10k/fm10k_pci.c +1 -1
index 21267ab603ef..3b821a31c4e0 100644
@@ -199,7 +199,7 @@ static void fm10k_start_service_event(struct fm10k_intfc *interface)
  **/
 static void fm10k_service_timer(struct timer_list *t)
 {
-	struct fm10k_intfc *interface = from_timer(interface, t,
+	struct fm10k_intfc *interface = timer_container_of(interface, t,
 						   service_timer);
 
 	/* Reset the timer */
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
index 120d68654e3f..f1c9e575703e 100644
@@ -11412,7 +11412,7 @@ static void i40e_service_task(struct work_struct *work)
  **/
 static void i40e_service_timer(struct timer_list *t)
 {
-	struct i40e_pf *pf = from_timer(pf, t, service_timer);
+	struct i40e_pf *pf = timer_container_of(pf, t, service_timer);
 
 	mod_timer(&pf->service_timer,
 		  round_jiffies(jiffies + pf->service_timer_period));
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
index d390157b59fe..10930146e45d 100644
@@ -1743,7 +1743,7 @@ static void ice_service_task_restart(struct ice_pf *pf)
  */
 static void ice_service_timer(struct timer_list *t)
 {
-	struct ice_pf *pf = from_timer(pf, t, serv_tmr);
+	struct ice_pf *pf = timer_container_of(pf, t, serv_tmr);
 
 	mod_timer(&pf->serv_tmr, round_jiffies(pf->serv_tmr_period + jiffies));
 	ice_service_task_schedule(pf);
drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c +1 -1
index 7752920d7a8e..05fea471de90 100644
@@ -1450,7 +1450,7 @@ static int ice_vc_fdir_write_fltr(struct ice_vf *vf,
  */
 static void ice_vf_fdir_timer(struct timer_list *t)
 {
-	struct ice_vf_fdir_ctx *ctx_irq = from_timer(ctx_irq, t, rx_tmr);
+	struct ice_vf_fdir_ctx *ctx_irq = timer_container_of(ctx_irq, t, rx_tmr);
 	struct ice_vf_fdir_ctx *ctx_done;
 	struct ice_vf_fdir *fdir;
 	unsigned long flags;
drivers/net/ethernet/intel/igb/igb_main.c +2 -2
index c646c71915f0..8f3506984ca8 100644
@@ -5436,7 +5436,7 @@ static void igb_spoof_check(struct igb_adapter *adapter)
  */
 static void igb_update_phy_info(struct timer_list *t)
 {
-	struct igb_adapter *adapter = from_timer(adapter, t, phy_info_timer);
+	struct igb_adapter *adapter = timer_container_of(adapter, t, phy_info_timer);
 	igb_get_phy_info(&adapter->hw);
 }
 
@@ -5526,7 +5526,7 @@ static void igb_check_lvmmc(struct igb_adapter *adapter)
  **/
 static void igb_watchdog(struct timer_list *t)
 {
-	struct igb_adapter *adapter = from_timer(adapter, t, watchdog_timer);
+	struct igb_adapter *adapter = timer_container_of(adapter, t, watchdog_timer);
 	/* Do the rest outside of interrupt context */
 	schedule_work(&adapter->watchdog_task);
 }
drivers/net/ethernet/intel/igbvf/netdev.c +1 -1
index beb01248600f..92c8bfb15c3e 100644
@@ -1900,7 +1900,7 @@ static bool igbvf_has_link(struct igbvf_adapter *adapter)
  **/
 static void igbvf_watchdog(struct timer_list *t)
 {
-	struct igbvf_adapter *adapter = from_timer(adapter, t, watchdog_timer);
+	struct igbvf_adapter *adapter = timer_container_of(adapter, t, watchdog_timer);
 
 	/* Do the rest outside of interrupt context */
 	schedule_work(&adapter->watchdog_task);
drivers/net/ethernet/intel/igc/igc_main.c +2 -2
index f1330379e6bb..283df6b04a47 100644
@@ -5710,7 +5710,7 @@ static void igc_clear_interrupt_scheme(struct igc_adapter *adapter)
  */
 static void igc_update_phy_info(struct timer_list *t)
 {
-	struct igc_adapter *adapter = from_timer(adapter, t, phy_info_timer);
+	struct igc_adapter *adapter = timer_container_of(adapter, t, phy_info_timer);
 
 	igc_get_phy_info(&adapter->hw);
 }
@@ -5752,7 +5752,7 @@ bool igc_has_link(struct igc_adapter *adapter)
  */
 static void igc_watchdog(struct timer_list *t)
 {
-	struct igc_adapter *adapter = from_timer(adapter, t, watchdog_timer);
+	struct igc_adapter *adapter = timer_container_of(adapter, t, watchdog_timer);
 	/* Do the rest outside of interrupt context */
 	schedule_work(&adapter->watchdog_task);
 }
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -1
index a2718218963e..cd53199cf768 100644
@@ -8309,7 +8309,7 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
  **/
 static void ixgbe_service_timer(struct timer_list *t)
 {
-	struct ixgbe_adapter *adapter = from_timer(adapter, t, service_timer);
+	struct ixgbe_adapter *adapter = timer_container_of(adapter, t, service_timer);
 	unsigned long next_event_offset;
 
 	/* poll faster when waiting for link */
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -1
index a217c5c04804..5f71cd7c11a7 100644
@@ -3176,7 +3176,7 @@ void ixgbevf_update_stats(struct ixgbevf_adapter *adapter)
  **/
 static void ixgbevf_service_timer(struct timer_list *t)
 {
-	struct ixgbevf_adapter *adapter = from_timer(adapter, t,
+	struct ixgbevf_adapter *adapter = timer_container_of(adapter, t,
 						     service_timer);
 
 	/* Reset the timer */
drivers/net/ethernet/korina.c +1 -1
index 1e2ac1a5f099..b80014ef6539 100644
@@ -900,7 +900,7 @@ static void korina_check_media(struct net_device *dev, unsigned int init_media)
 
 static void korina_poll_media(struct timer_list *t)
 {
-	struct korina_private *lp = from_timer(lp, t, media_check_timer);
+	struct korina_private *lp = timer_container_of(lp, t, media_check_timer);
 	struct net_device *dev = lp->dev;
 
 	korina_check_media(dev, 0);
drivers/net/ethernet/marvell/mv643xx_eth.c +2 -2
index 8cc888bf6094..5006696eb93d 100644
@@ -1333,7 +1333,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)
 
 static void mib_counters_timer_wrapper(struct timer_list *t)
 {
-	struct mv643xx_eth_private *mp = from_timer(mp, t, mib_counters_timer);
+	struct mv643xx_eth_private *mp = timer_container_of(mp, t, mib_counters_timer);
 	mib_counters_update(mp);
 	mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ);
 }
@@ -2306,7 +2306,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
 
 static inline void oom_timer_wrapper(struct timer_list *t)
 {
-	struct mv643xx_eth_private *mp = from_timer(mp, t, rx_oom);
+	struct mv643xx_eth_private *mp = timer_container_of(mp, t, rx_oom);
 
 	napi_schedule(&mp->napi);
 }
drivers/net/ethernet/marvell/pxa168_eth.c +1 -1
index 72c1967768f4..e4cfdc8bc055 100644
@@ -353,7 +353,7 @@ static void rxq_refill(struct net_device *dev)
 
 static inline void rxq_refill_timer_wrapper(struct timer_list *t)
 {
-	struct pxa168_eth_private *pep = from_timer(pep, t, timeout);
+	struct pxa168_eth_private *pep = timer_container_of(pep, t, timeout);
 	napi_schedule(&pep->napi);
 }
 
drivers/net/ethernet/marvell/skge.c +1 -1
index b2081d6e34f0..05349a0b2db1 100644
@@ -1494,7 +1494,7 @@ static int xm_check_link(struct net_device *dev)
  */
 static void xm_link_timer(struct timer_list *t)
 {
-	struct skge_port *skge = from_timer(skge, t, link_timer);
+	struct skge_port *skge = timer_container_of(skge, t, link_timer);
 	struct net_device *dev = skge->netdev;
 	struct skge_hw *hw = skge->hw;
 	int port = skge->port;
drivers/net/ethernet/marvell/sky2.c +1 -1
index e2a9aae8bc9b..3831f533b9db 100644
@@ -2961,7 +2961,7 @@ static int sky2_rx_hung(struct net_device *dev)
 
 static void sky2_watchdog(struct timer_list *t)
 {
-	struct sky2_hw *hw = from_timer(hw, t, watchdog_timer);
+	struct sky2_hw *hw = timer_container_of(hw, t, watchdog_timer);
 
 	/* Check for lost IRQ once a second */
 	if (sky2_read32(hw, B0_ISRC)) {
drivers/net/ethernet/mellanox/mlx4/catas.c +1 -1
index 33ba0a5c38ac..edcc6f662618 100644
@@ -236,7 +236,7 @@ static void dump_err_buf(struct mlx4_dev *dev)
 
 static void poll_catas(struct timer_list *t)
 {
-	struct mlx4_priv *priv = from_timer(priv, t, catas_err.timer);
+	struct mlx4_priv *priv = timer_container_of(priv, t, catas_err.timer);
 	struct mlx4_dev *dev = &priv->dev;
 	u32 slave_read;
 
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +1 -1
index 5442a02c4097..d70351815d7c 100644
@@ -278,7 +278,7 @@ static void mlx5_sync_reset_reload_work(struct work_struct *work)
 #define MLX5_RESET_POLL_INTERVAL	(HZ / 10)
 static void poll_sync_reset(struct timer_list *t)
 {
-	struct mlx5_fw_reset *fw_reset = from_timer(fw_reset, t, timer);
+	struct mlx5_fw_reset *fw_reset = timer_container_of(fw_reset, t, timer);
 	struct mlx5_core_dev *dev = fw_reset->dev;
 	u32 fatal_error;
 
drivers/net/ethernet/mellanox/mlx5/core/health.c +1 -1
index 624452ddebc0..e96eb0a8e511 100644
@@ -779,7 +779,7 @@ static void mlx5_health_log_ts_update(struct work_struct *work)
 
 static void poll_health(struct timer_list *t)
 {
-	struct mlx5_core_dev *dev = from_timer(dev, t, priv.health.timer);
+	struct mlx5_core_dev *dev = timer_container_of(dev, t, priv.health.timer);
 	struct mlx5_core_health *health = &dev->priv.health;
 	struct health_buffer __iomem *h = health->health;
 	u32 fatal_error;
drivers/net/ethernet/micrel/ksz884x.c +2 -2
index 1302aa8e0853..bdf42518d431 100644
@@ -6304,7 +6304,7 @@ static void mib_read_work(struct work_struct *work)
 
 static void mib_monitor(struct timer_list *t)
 {
-	struct dev_info *hw_priv = from_timer(hw_priv, t, mib_timer_info.timer);
+	struct dev_info *hw_priv = timer_container_of(hw_priv, t, mib_timer_info.timer);
 
 	mib_read_work(&hw_priv->mib_read);
 
@@ -6331,7 +6331,7 @@ static void mib_monitor(struct timer_list *t)
  */
 static void dev_monitor(struct timer_list *t)
 {
-	struct dev_priv *priv = from_timer(priv, t, monitor_timer_info.timer);
+	struct dev_priv *priv = timer_container_of(priv, t, monitor_timer_info.timer);
 	struct net_device *dev = priv->mii_if.dev;
 	struct dev_info *hw_priv = priv->adapter;
 	struct ksz_hw *hw = &hw_priv->hw;
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 -1
index 7c501a758325..e611ff7fa3fa 100644
@@ -3478,7 +3478,7 @@ static void myri10ge_watchdog_timer(struct timer_list *t)
 	u32 rx_pause_cnt;
 	u16 cmd;
 
-	mgp = from_timer(mgp, t, watchdog_timer);
+	mgp = timer_container_of(mgp, t, watchdog_timer);
 
 	rx_pause_cnt = ntohl(mgp->ss[0].fw_stats->dropped_pause);
 	busy_slice_cnt = 0;
drivers/net/ethernet/natsemi/natsemi.c +1 -1
index 05606692e631..12ff5a4c6e44 100644
@@ -1786,7 +1786,7 @@ static void init_registers(struct net_device *dev)
  */
 static void netdev_timer(struct timer_list *t)
 {
-	struct netdev_private *np = from_timer(np, t, timer);
+	struct netdev_private *np = timer_container_of(np, t, timer);
 	struct net_device *dev = np->dev;
 	void __iomem * ioaddr = ns_ioaddr(dev);
 	int next_tick = NATSEMI_TIMER_FREQ;
drivers/net/ethernet/natsemi/ns83820.c +1 -1
index bf0347715a05..56d5464222d9 100644
@@ -1587,7 +1587,7 @@ static void ns83820_tx_timeout(struct net_device *ndev, unsigned int txqueue)
 
 static void ns83820_tx_watch(struct timer_list *t)
 {
-	struct ns83820 *dev = from_timer(dev, t, tx_watchdog);
+	struct ns83820 *dev = timer_container_of(dev, t, tx_watchdog);
 	struct net_device *ndev = dev->ndev;
 
 #if defined(DEBUG)
drivers/net/ethernet/neterion/s2io.c +1 -1
index 3e55e8dc664c..27443e346f9f 100644
@@ -4195,7 +4195,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
 static void
 s2io_alarm_handle(struct timer_list *t)
 {
-	struct s2io_nic *sp = from_timer(sp, t, alarm_timer);
+	struct s2io_nic *sp = timer_container_of(sp, t, alarm_timer);
 	struct net_device *dev = sp->dev;
 
 	s2io_handle_errors(dev);
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +1 -1
index 95514fabadf2..75bdf75c2dec 100644
@@ -159,7 +159,7 @@ static int nfp_net_reconfig_wait(struct nfp_net *nn, unsigned long deadline)
 
 static void nfp_net_reconfig_timer(struct timer_list *t)
 {
-	struct nfp_net *nn = from_timer(nn, t, reconfig_timer);
+	struct nfp_net *nn = timer_container_of(nn, t, reconfig_timer);
 
 	spin_lock_bh(&nn->reconfig_lock);
 
drivers/net/ethernet/nvidia/forcedeth.c +3 -3
index 29cb74ccb25a..19aa1f1538aa 100644
@@ -1891,7 +1891,7 @@ static int nv_alloc_rx_optimized(struct net_device *dev)
 /* If rx bufs are exhausted called after 50ms to attempt to refresh */
 static void nv_do_rx_refill(struct timer_list *t)
 {
-	struct fe_priv *np = from_timer(np, t, oom_kick);
+	struct fe_priv *np = timer_container_of(np, t, oom_kick);
 
 	/* Just reschedule NAPI rx processing */
 	napi_schedule(&np->napi);
@@ -4140,7 +4140,7 @@ static void nv_free_irq(struct net_device *dev)
 
 static void nv_do_nic_poll(struct timer_list *t)
 {
-	struct fe_priv *np = from_timer(np, t, nic_poll);
+	struct fe_priv *np = timer_container_of(np, t, nic_poll);
 	struct net_device *dev = np->dev;
 	u8 __iomem *base = get_hwbase(dev);
 	u32 mask = 0;
@@ -4259,7 +4259,7 @@ static void nv_do_stats_poll(struct timer_list *t)
 	__acquires(&netdev_priv(dev)->hwstats_lock)
 	__releases(&netdev_priv(dev)->hwstats_lock)
 {
-	struct fe_priv *np = from_timer(np, t, stats_poll);
+	struct fe_priv *np = timer_container_of(np, t, stats_poll);
 	struct net_device *dev = np->dev;
 
 	/* If lock is currently taken, the stats are being refreshed
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +1 -1
index 1651df8a7c21..3f2739a479b0 100644
@@ -1014,7 +1014,7 @@ static void pch_gbe_set_mode(struct pch_gbe_adapter *adapter, u16 speed,
  */
 static void pch_gbe_watchdog(struct timer_list *t)
 {
-	struct pch_gbe_adapter *adapter = from_timer(adapter, t,
+	struct pch_gbe_adapter *adapter = timer_container_of(adapter, t,
 						     watchdog_timer);
 	struct net_device *netdev = adapter->netdev;
 	struct pch_gbe_hw *hw = &adapter->hw;
drivers/net/ethernet/packetengines/hamachi.c +1 -1
index 26bc8b3b1ec8..b0de7e9f12a5 100644
@@ -1025,7 +1025,7 @@ static inline int hamachi_tx(struct net_device *dev)
 
 static void hamachi_timer(struct timer_list *t)
 {
-	struct hamachi_private *hmp = from_timer(hmp, t, timer);
+	struct hamachi_private *hmp = timer_container_of(hmp, t, timer);
 	struct net_device *dev = hmp->mii_if.dev;
 	void __iomem *ioaddr = hmp->base;
 	int next_tick = 10*HZ;
drivers/net/ethernet/packetengines/yellowfin.c +1 -1
index 21b760e65d73..1e25ac13a7d8 100644
@@ -652,7 +652,7 @@ static int yellowfin_open(struct net_device *dev)
 
 static void yellowfin_timer(struct timer_list *t)
 {
-	struct yellowfin_private *yp = from_timer(yp, t, timer);
+	struct yellowfin_private *yp = timer_container_of(yp, t, timer);
 	struct net_device *dev = pci_get_drvdata(yp->pci_dev);
 	void __iomem *ioaddr = yp->base;
 	int next_tick = 60*HZ;
drivers/net/ethernet/pasemi/pasemi_mac.c +1 -1
index 801380729046..4e00175533e9 100644
@@ -934,7 +934,7 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data)
 
 static void pasemi_mac_tx_timer(struct timer_list *t)
 {
-	struct pasemi_mac_txring *txring = from_timer(txring, t, clean_timer);
+	struct pasemi_mac_txring *txring = timer_container_of(txring, t, clean_timer);
 	struct pasemi_mac *mac = txring->mac;
 
 	pasemi_mac_clean_tx(txring);
drivers/net/ethernet/pensando/ionic/ionic_dev.c +1 -1
index 57edcde9e6f8..18b9c8a810ae 100644
@@ -13,7 +13,7 @@
 
 static void ionic_watchdog_cb(struct timer_list *t)
 {
-	struct ionic *ionic = from_timer(ionic, t, watchdog_timer);
+	struct ionic *ionic = timer_container_of(ionic, t, watchdog_timer);
 	struct ionic_lif *lif = ionic->lif;
 	struct ionic_deferred_work *work;
 	int hb;
drivers/net/ethernet/qlogic/qla3xxx.c +1 -1
index bf5bf8c95c85..aee4e63b4b82 100644
@@ -3735,7 +3735,7 @@ static void ql_get_board_info(struct ql3_adapter *qdev)
 
 static void ql3xxx_timer(struct timer_list *t)
 {
-	struct ql3_adapter *qdev = from_timer(qdev, t, adapter_timer);
+	struct ql3_adapter *qdev = timer_container_of(qdev, t, adapter_timer);
 	queue_delayed_work(qdev->workqueue, &qdev->link_state_work, 0);
 }
 
drivers/net/ethernet/realtek/atp.c +1 -1
index c73a57e4a144..0d65434982a2 100644
@@ -717,7 +717,7 @@ static irqreturn_t atp_interrupt(int irq, void *dev_instance)
    problem where the adapter forgets its ethernet address. */
 static void atp_timed_checker(struct timer_list *t)
 {
-	struct net_local *lp = from_timer(lp, t, timer);
+	struct net_local *lp = timer_container_of(lp, t, timer);
 	struct net_device *dev = lp->dev;
 	long ioaddr = dev->base_addr;
 	int tickssofar = jiffies - lp->last_rx_time;
drivers/net/ethernet/rocker/rocker_ofdpa.c +1 -1
index d5db26103d82..c7170b21c445 100644
@@ -1982,7 +1982,7 @@ static int ofdpa_port_fdb_flush(struct ofdpa_port *ofdpa_port, int flags)
 
 static void ofdpa_fdb_cleanup(struct timer_list *t)
 {
-	struct ofdpa *ofdpa = from_timer(ofdpa, t, fdb_cleanup_timer);
+	struct ofdpa *ofdpa = timer_container_of(ofdpa, t, fdb_cleanup_timer);
 	struct ofdpa_port *ofdpa_port;
 	struct ofdpa_fdb_tbl_entry *entry;
 	struct hlist_node *tmp;
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +2 -2
index 36b63bf343a9..f0da8f118ab8 100644
@@ -104,7 +104,7 @@ void sxgbe_disable_eee_mode(struct sxgbe_priv_data * const priv)
  */
 static void sxgbe_eee_ctrl_timer(struct timer_list *t)
 {
-	struct sxgbe_priv_data *priv = from_timer(priv, t, eee_ctrl_timer);
+	struct sxgbe_priv_data *priv = timer_container_of(priv, t, eee_ctrl_timer);
 
 	sxgbe_enable_eee_mode(priv);
 	mod_timer(&priv->eee_ctrl_timer, SXGBE_LPI_TIMER(eee_timer));
@@ -1012,7 +1012,7 @@ static void sxgbe_disable_mtl_engine(struct sxgbe_priv_data *priv)
  */
 static void sxgbe_tx_timer(struct timer_list *t)
 {
-	struct sxgbe_tx_queue *p = from_timer(p, t, txtimer);
+	struct sxgbe_tx_queue *p = timer_container_of(p, t, txtimer);
 	sxgbe_tx_queue_clean(p);
 }
 
drivers/net/ethernet/seeq/ether3.c +1 -1
index 1d65113fab76..20dad39b5ab9 100644
@@ -170,7 +170,7 @@ ether3_setbuffer(struct net_device *dev, buffer_rw_t read, int start)
  */
 static void ether3_ledoff(struct timer_list *t)
 {
-	struct dev_priv *private = from_timer(private, t, timer);
+	struct dev_priv *private = timer_container_of(private, t, timer);
 	struct net_device *dev = private->dev;
 
 	ether3_outw(priv(dev)->regs.config2 |= CFG2_CTRLO, REG_CONFIG2);
drivers/net/ethernet/sfc/falcon/falcon.c +1 -1
index b865275beb66..182a393ef6bc 100644
@@ -1453,7 +1453,7 @@ static void falcon_stats_complete(struct ef4_nic *efx)
 
 static void falcon_stats_timer_func(struct timer_list *t)
 {
-	struct falcon_nic_data *nic_data = from_timer(nic_data, t,
+	struct falcon_nic_data *nic_data = timer_container_of(nic_data, t,
 						      stats_timer);
 	struct ef4_nic *efx = nic_data->efx;
 
drivers/net/ethernet/sfc/falcon/rx.c +1 -1
index 38ad7ac07726..e788faf73945 100644
@@ -382,7 +382,7 @@ void ef4_fast_push_rx_descriptors(struct ef4_rx_queue *rx_queue, bool atomic)
 
 void ef4_rx_slow_fill(struct timer_list *t)
 {
-	struct ef4_rx_queue *rx_queue = from_timer(rx_queue, t, slow_fill);
+	struct ef4_rx_queue *rx_queue = timer_container_of(rx_queue, t, slow_fill);
 
 	/* Post an event to cause NAPI to run and refill the queue */
 	ef4_nic_generate_fill_event(rx_queue);
drivers/net/ethernet/sfc/mcdi.c +1 -1
index dcef0588be96..5e9b8def5e42 100644
@@ -605,7 +605,7 @@ static void efx_mcdi_ev_cpl(struct efx_nic *efx, unsigned int seqno,
 
 static void efx_mcdi_timeout_async(struct timer_list *t)
 {
-	struct efx_mcdi_iface *mcdi = from_timer(mcdi, t, async_timer);
+	struct efx_mcdi_iface *mcdi = timer_container_of(mcdi, t, async_timer);
 
 	efx_mcdi_complete_async(mcdi, true);
 }
drivers/net/ethernet/sfc/rx_common.c +1 -1
index 8eb272ba674b..d28957288413 100644
@@ -352,7 +352,7 @@ void efx_free_rx_buffers(struct efx_rx_queue *rx_queue,
 
 void efx_rx_slow_fill(struct timer_list *t)
 {
-	struct efx_rx_queue *rx_queue = from_timer(rx_queue, t, slow_fill);
+	struct efx_rx_queue *rx_queue = timer_container_of(rx_queue, t, slow_fill);
 
 	/* Post an event to cause NAPI to run and refill the queue */
 	efx_nic_generate_fill_event(rx_queue);
drivers/net/ethernet/sfc/siena/mcdi.c +1 -1
index 99ab5f294691..c8f0fb43e285 100644
@@ -609,7 +609,7 @@ static void efx_mcdi_ev_cpl(struct efx_nic *efx, unsigned int seqno,
 
 static void efx_mcdi_timeout_async(struct timer_list *t)
 {
-	struct efx_mcdi_iface *mcdi = from_timer(mcdi, t, async_timer);
+	struct efx_mcdi_iface *mcdi = timer_container_of(mcdi, t, async_timer);
 
 	efx_mcdi_complete_async(mcdi, true);
 }
drivers/net/ethernet/sfc/siena/rx_common.c +1 -1
index ab493e529d5c..9f97f590c2fb 100644
@@ -349,7 +349,7 @@ void efx_siena_free_rx_buffers(struct efx_rx_queue *rx_queue,
 
 void efx_siena_rx_slow_fill(struct timer_list *t)
 {
-	struct efx_rx_queue *rx_queue = from_timer(rx_queue, t, slow_fill);
+	struct efx_rx_queue *rx_queue = timer_container_of(rx_queue, t, slow_fill);
 
 	/* Post an event to cause NAPI to run and refill the queue */
 	efx_nic_generate_fill_event(rx_queue);
drivers/net/ethernet/sgi/ioc3-eth.c +1 -1
index 7196e1c607f3..39731069d99e 100644
@@ -570,7 +570,7 @@ static inline void ioc3_setup_duplex(struct ioc3_private *ip)
 
 static void ioc3_timer(struct timer_list *t)
 {
-	struct ioc3_private *ip = from_timer(ip, t, ioc3_timer);
+	struct ioc3_private *ip = timer_container_of(ip, t, ioc3_timer);
 
 	/* Print the link status if it has changed */
 	mii_check_media(&ip->mii, 1, 0);
drivers/net/ethernet/sis/sis190.c +1 -1
index d10b14787607..15e46e6ac262 100644

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

drivers/net/ethernet/sis/sis900.c +1 -1
index 332cbd725900..3172f898171d 100644

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

drivers/net/ethernet/smsc/epic100.c +1 -1
index ca0ab3a35b73..45f703fe0e5a 100644

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

drivers/net/ethernet/smsc/smc91c92_cs.c +1 -1
index 6fa957fb523b..cc0c75694351 100644

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

drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c +1 -1
index 3a4bee029c7f..6babf2f2fcd3 100644

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

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
index 59d07d0d3369..f173a7689331 100644

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

drivers/net/ethernet/sun/cassini.c +1 -1
index b777e5a099eb..acfb523214b9 100644

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

drivers/net/ethernet/sun/niu.c +1 -1
index 73c07f10f053..2f185827abba 100644

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

drivers/net/ethernet/sun/sunbmac.c +1 -1
index d2c82102133c..edb2fd3a6551 100644

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

drivers/net/ethernet/sun/sungem.c +1 -1
index 06579d7b5220..8e69d917d827 100644

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

drivers/net/ethernet/sun/sunhme.c +1 -1
index 9a7586623318..4bc0e114d5ee 100644

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

drivers/net/ethernet/sun/sunvnet_common.c +1 -1
index ddc6d46a7a86..0212853c9430 100644

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

drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +1 -1
index 24e4b246f25f..9fda2fabfd1e 100644

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

drivers/net/ethernet/ti/cpsw_ale.c +1 -1
index 7f77694ecfba..fbe35af615a6 100644

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

drivers/net/ethernet/ti/netcp_ethss.c +1 -1
index fd2b74508980..55a1a96cd834 100644

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

drivers/net/ethernet/ti/tlan.c +2 -2
index d9240fb91747..a55b0f951181 100644

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

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

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

drivers/net/fddi/defza.c +1 -1
index 54b7f24f3810..2098c3068d34 100644

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

drivers/net/hamradio/6pack.c +2 -2
index b33d84ed5bbf..c5e5423e1863 100644

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

drivers/net/hamradio/scc.c +7 -7
index f88721dec681..ae5048efde68 100644

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

drivers/net/hippi/rrunner.c +1 -1
index 6342c319c0e4..7b7e7a47a75e 100644

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

drivers/net/ntb_netdev.c +1 -1
index ef4204638392..fbeae05817e9 100644

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

drivers/net/slip/slip.c +2 -2
index 3cfa17cd5073..c889fb374703 100644

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

drivers/net/tun.c +1 -1
index 7babd1e9a378..afd3c4a8c3ea 100644

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

drivers/net/usb/catc.c +1 -1
index fc5e441aa7c3..6759388692f8 100644

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

drivers/net/usb/lan78xx.c +1 -1
index e4f1663b6204..7377188fb476 100644

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

drivers/net/usb/sierra_net.c +1 -1
index dec6e82eb0e0..c30ca415d1d3 100644

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

drivers/net/usb/usbnet.c +1 -1
index c39dfa17813a..c04e715a4c2a 100644

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

drivers/net/vxlan/vxlan_core.c +1 -1
index 9ccc3f09f71b..2cd67b3b7975 100644

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

drivers/net/wan/hdlc_cisco.c +1 -1
index 7e653432c139..bfc978b15bc2 100644

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

drivers/net/wan/hdlc_fr.c +1 -1
index 34014f427060..08a0ba5ca471 100644

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

drivers/net/wan/hdlc_ppp.c +1 -1
index 19921b02846d..7496a2e9a282 100644

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

drivers/net/wireguard/timers.c +5 -5
index a9e0890c2f77..3061e20fcc22 100644

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

drivers/net/wireless/ath/ar5523/ar5523.c +1 -1
index 96dc2778022a..343c9de2749c 100644

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

drivers/net/wireless/ath/ath10k/htt_rx.c +1 -1
index 83eab7479f06..47829b109192 100644

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

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

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

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

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

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

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

drivers/net/wireless/ath/ath11k/ce.c +1 -1
index e66e86bdec20..be1aebe48d1a 100644

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

drivers/net/wireless/ath/ath11k/dp.c +1 -1
index 3a544e5fefca..7295020c7806 100644

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

drivers/net/wireless/ath/ath11k/dp_rx.c +2 -2
index 218ab41c0f3c..cb2fc5a257c3 100644

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

drivers/net/wireless/ath/ath12k/ce.c +1 -1
index be0d669d31fc..45acc6fbf828 100644

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

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

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

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

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

drivers/net/wireless/ath/ath6kl/main.c +1 -1
index 867089a3c096..d62b96459751 100644

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

drivers/net/wireless/ath/ath6kl/recovery.c +1 -1
index fd2dceb8b63d..43186c193df1 100644

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

drivers/net/wireless/ath/ath6kl/txrx.c +1 -1
index 3a6f0b647e17..87dc2237c3ee 100644

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

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

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

drivers/net/wireless/ath/ath9k/channel.c +2 -2
index 799be0be24f4..121e51ce1bc0 100644

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

drivers/net/wireless/ath/ath9k/gpio.c +2 -2
index 5a26f1d05f04..8b9bde7135d4 100644

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

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

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

drivers/net/wireless/ath/ath9k/link.c +1 -1
index 7f890997bb53..5d7e3ddb6dbc 100644

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

drivers/net/wireless/ath/ath9k/main.c +1 -1
index 92fc5e3d756e..c56f4f3b8990 100644

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

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

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

drivers/net/wireless/ath/wil6210/netdev.c +3 -3
index 59884e8e3765..dd59963cac51 100644

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

drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +1 -1
index e0de34a3e43a..34c7e04f8444 100644

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

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

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

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +1 -1
index 9f1854b3d1a5..d40d2823a1e5 100644

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

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -1
index 93727b9a5f0d..cf26ab15ee0c 100644

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

drivers/net/wireless/intel/ipw2x00/libipw_crypto.c +1 -1
index dfcc12aa8620..2fe539d5bbf9 100644

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

drivers/net/wireless/intel/iwlegacy/3945-rs.c +1 -1
index df1b8ec86651..229c36116b60 100644

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

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

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

drivers/net/wireless/intel/iwlegacy/common.c +1 -1
index 09fb4b758704..9a86688aea67 100644

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

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

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

drivers/net/wireless/intel/iwlwifi/dvm/tt.c +2 -2
index 98f0949b3683..612be73761b5 100644

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

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

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

drivers/net/wireless/intel/iwlwifi/mld/agg.c +1 -1
index db9e0f04f4b7..301959bb269f 100644

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

drivers/net/wireless/intel/iwlwifi/mvm/sta.c +1 -1
index 78fd7faaed97..728df20bf990 100644

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

drivers/net/wireless/intel/iwlwifi/pcie/tx.c +1 -1
index bb90bcfc6763..25bf2efb785c 100644

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

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

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

drivers/net/wireless/marvell/libertas/main.c +2 -2
index 26d13e9b3c95..01a79452c400 100644

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

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

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

drivers/net/wireless/marvell/libertas_tf/main.c +1 -1
index a57a11be57d8..50c0f6179e2d 100644

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

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

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

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

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

drivers/net/wireless/marvell/mwifiex/init.c +1 -1
index ce0d42e72e94..526d424f96cc 100644

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

drivers/net/wireless/marvell/mwifiex/tdls.c +1 -1
index 18e8c04d14c4..80121401111e 100644

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

drivers/net/wireless/marvell/mwifiex/usb.c +1 -1
index 2f565397cf36..947ecb0a7b40 100644

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

drivers/net/wireless/mediatek/mt76/mt7615/main.c +1 -1
index c54005df08ca..8a37fb37f77d 100644

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

drivers/net/wireless/mediatek/mt76/mt792x_core.c +2 -2
index 38dd58f6e493..a50c1723ca29 100644

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

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

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

drivers/net/wireless/purelifi/plfxlc/usb.c +2 -2
index 10d2e2124ff8..1c54cb2906bf 100644

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

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

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

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

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

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c +1 -1
index 27f6c35ba0f9..516be255afcc 100644

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

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

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

drivers/net/wireless/rsi/rsi_91x_hal.c +1 -1
index 53827657abb2..7d26314a3e76 100644

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

drivers/net/wireless/rsi/rsi_91x_mac80211.c +1 -1
index 9db08200f4fa..0e115b428f96 100644

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

drivers/net/wireless/st/cw1200/queue.c +1 -1
index 4fd76183c368..a933e2c7dc2c 100644

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

drivers/net/wireless/st/cw1200/sta.c +1 -1
index 444272caf124..e633b77a8f20 100644

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

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

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

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

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

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

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

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

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

drivers/nfc/pn533/pn533.c +1 -1
index 34c40d10e260..14661249c690 100644

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

drivers/nfc/pn533/uart.c +1 -1
index 580c9193e4a7..a081bce61c29 100644

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

drivers/nfc/st-nci/ndlc.c +2 -2
index 8feac119a4bc..be4808859cfa 100644

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

drivers/nfc/st-nci/se.c +2 -2
index 8cfe5405bae6..ff5c3d56b337 100644

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

drivers/nfc/st21nfca/se.c +2 -2
index 9a50f3c03bd4..0a21bc515141 100644

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

drivers/nvme/host/multipath.c +1 -1
index 05eccd96d34a..7b8eaefb322d 100644

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

drivers/parport/ieee1284.c +1 -1
index 474515d27e9c..4035010249cd 100644

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

drivers/pci/hotplug/cpqphp_ctrl.c +1 -1
index 20529d1a3c44..760a5dec0431 100644

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

drivers/pci/hotplug/shpchp_hpc.c +1 -1
index 387b85585263..183bf43510a1 100644

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

drivers/pcmcia/bcm63xx_pcmcia.c +1 -1
index 85874b7a9f36..d3baed444646 100644

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

drivers/pcmcia/electra_cf.c +1 -1
index 3bdd939dd2f4..2530079d38f4 100644

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

drivers/pcmcia/omap_cf.c +1 -1
index f0ccf479f36e..1b1dff56ec7b 100644

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

drivers/pcmcia/pd6729.c +1 -1
index a0a2e7f18356..5261badcd903 100644

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

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

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

drivers/pcmcia/yenta_socket.c +1 -1
index 020ea86c24ec..372db25c1589 100644

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

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

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

drivers/pps/clients/pps-gpio.c +1 -1
index 374ceefd6f2a..47d9891de368 100644

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

drivers/ptp/ptp_ocp.c +1 -1
index 7945c6be1f7c..eed47dcaa3de 100644

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

drivers/rtc/dev.c +1 -1
index 0eeae5bcc3aa..baf1a8ca8b2b 100644

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

drivers/rtc/rtc-test.c +1 -1
index a9f5b9466fb5..94f995febe5b 100644

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

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

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

drivers/s390/char/con3215.c +1 -1
index 6a61c0a595d9..56e43d43c713 100644

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

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

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

drivers/s390/char/tape_core.c +1 -1
index 48e8417a5cff..fa063e84eafc 100644

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

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

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

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

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

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

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

drivers/s390/crypto/ap_bus.c +1 -1
index 1564cd7e3f59..09b9fe81b070 100644

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

drivers/s390/net/fsm.c +1 -1
index 5fcdce116862..6a12d2422540 100644

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

drivers/s390/net/qeth_core_main.c +1 -1
index f5cfaebfb7c9..751952e8eb68 100644

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

drivers/s390/scsi/zfcp_erp.c +2 -2
index 78d52a4c55f5..ffd994416995 100644

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

drivers/s390/scsi/zfcp_fsf.c +1 -1
index d5f5f563881e..c5bba1be88f4 100644

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

drivers/s390/scsi/zfcp_qdio.c +1 -1
index 0957e3f8b46e..939dcabf2ae2 100644

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

drivers/scsi/aic7xxx/aic79xx_core.c +1 -1
index f9372a81cd4e..6b87ea004e53 100644

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

drivers/scsi/aic94xx/aic94xx_scb.c +1 -1
index 68214a58b160..08c8dad9ad62 100644

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

drivers/scsi/aic94xx/aic94xx_tmf.c +2 -2
index d45dbf98f25e..28ac92b041fe 100644

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

drivers/scsi/arcmsr/arcmsr_hba.c +2 -2
index b450b1fc6bbb..929a3d2f88cd 100644

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

drivers/scsi/arm/fas216.c +1 -1
index e0b55d869a35..b1a749ab18f8 100644

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

drivers/scsi/be2iscsi/be_main.c +2 -2
index 7d1b767d87fb..dc88bc46dcc0 100644

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

drivers/scsi/bfa/bfad.c +1 -1
index 695c77c5275d..0768f086451b 100644

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

drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -1
index de6574cccf58..58da993251e9 100644

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

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

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

drivers/scsi/bnx2i/bnx2i_hwi.c +1 -1
index 6c864b093ac9..40db5190a222 100644

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

drivers/scsi/csiostor/csio_hw.c +2 -2
index beded091dff1..7aa418ebfe01 100644

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

drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +1 -1
index 461d38e2fb19..69de9657f7cb 100644

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

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

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

drivers/scsi/dc395x.c +1 -1
index 8dc6be9a00c1..61bd89b7964d 100644

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

drivers/scsi/elx/efct/efct_xport.c +1 -1
index 2aca60f6428e..dfe05fab7b42 100644

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

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

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

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

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

drivers/scsi/esas2r/esas2r_main.c +1 -1
index 44871746944a..3f31875ff46e 100644

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

drivers/scsi/fcoe/fcoe_ctlr.c +1 -1
index 56d270526c9c..8e4241c295e3 100644

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

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

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

drivers/scsi/fnic/fdls_disc.c +3 -3
index c2b6f4eb338e..ab5c0cf142ee 100644

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

drivers/scsi/fnic/fip.c +4 -4
index 6e7c0b00eb41..becdcabafd8c 100644

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

drivers/scsi/fnic/fnic_main.c +1 -1
index 9a357ff42085..4cc4077ea53c 100644

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

drivers/scsi/hisi_sas/hisi_sas_main.c +1 -1
index 5cb1d3db4907..894846f0f014 100644

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

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +1 -1
index 6621d633b2cc..a92679060ad3 100644

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

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +3 -3
index a1fc400ab4c3..87cff6d7d8d5 100644

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

drivers/scsi/ibmvscsi/ibmvfc.c +2 -2
index 4c493b06062a..862ab0fbc893 100644

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

drivers/scsi/ibmvscsi/ibmvscsi.c +1 -1
index d65a45860b33..c9285d1faf23 100644

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

drivers/scsi/ipr.c +4 -4
index d89135fb8faa..b29bec6abd72 100644

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

drivers/scsi/isci/host.c +3 -3
index c108b5b940c3..6d2f4c831df7 100644

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

drivers/scsi/isci/phy.c +1 -1
index 743a3c64b0da..88237ec8b15f 100644

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

drivers/scsi/isci/port.c +1 -1
index 1609aba1c9c1..10bd2aac2cb4 100644

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

drivers/scsi/isci/port_config.c +2 -2
index c382a257b51b..3b4820defe63 100644

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

drivers/scsi/libfc/fc_fcp.c +2 -2
index e705c30b4e1b..16d0f02af1e4 100644

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

drivers/scsi/libiscsi.c +2 -2
index 1ddaf7228340..0d441f4cdb5d 100644

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

drivers/scsi/libsas/sas_scsi_host.c +1 -1
index feb2461b90e8..928723c90b75 100644

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

drivers/scsi/lpfc/lpfc_ct.c +1 -1
index 12c67cdd7c19..0b313aaf033e 100644

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

drivers/scsi/lpfc/lpfc_els.c +3 -3
index 375a879c31f1..83eec96f1043 100644

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

drivers/scsi/lpfc/lpfc_hbadisc.c +1 -1
index 179be6c5a43e..2eaf46be8bb7 100644

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

drivers/scsi/lpfc/lpfc_init.c +4 -4
index 90021653e59e..68e6ba085b2b 100644

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

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

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

drivers/scsi/lpfc/lpfc_sli.c +3 -3
index 6574f9e74476..b694fe1bf714 100644

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

drivers/scsi/megaraid/megaraid_mbox.c +1 -1
index d533a8aa72cc..ce72cb04a78a 100644

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

drivers/scsi/megaraid/megaraid_mm.c +1 -1
index 1f2cd15e3361..d3133be36879 100644

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

drivers/scsi/megaraid/megaraid_sas_base.c +1 -1
index c20447b39cb9..e94bf778e83b 100644

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

drivers/scsi/mvsas/mv_sas.c +1 -1
index 52ac10226cb0..6c46654b9cd9 100644

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

drivers/scsi/ncr53c8xx.c +1 -1
index 14ac81ec0aa0..34ba9b137789 100644

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

drivers/scsi/pmcraid.c +3 -3
index e0aeb206df8d..33f403e307eb 100644

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

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

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

drivers/scsi/qla2xxx/qla_edif.c +1 -1
index dcde55c8ee5d..32e9f7aefecf 100644

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

drivers/scsi/qla2xxx/qla_init.c +1 -1
index 0c2dd782b675..514934dd6f80 100644

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

drivers/scsi/qla2xxx/qla_os.c +1 -1
index b44d134e7105..c028a9979e45 100644

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

drivers/scsi/qla4xxx/ql4_os.c +1 -1
index d540d66e6ffc..d4141656b204 100644

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

drivers/scsi/smartpqi/smartpqi_init.c +1 -1
index 88135fdb8bd1..0042f8e648d0 100644

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

drivers/scsi/sym53c8xx_2/sym_glue.c +1 -1
index 1a6eb72ca281..57637a81776d 100644

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

drivers/staging/gpib/agilent_82357a/agilent_82357a.c +1 -1
index da229965d98e..c4f49e20d5f3 100644

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

drivers/staging/gpib/common/gpib_os.c +2 -2
index 8456b97290b8..e6693046d262 100644

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

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

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

drivers/staging/gpib/ni_usb/ni_usb_gpib.c +1 -1
index 9f1b9927f025..ff0931e1ce01 100644

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

drivers/staging/media/imx/imx-ic-prpencvf.c +1 -1
index 2855ba2296ac..77360bfe081a 100644

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

drivers/staging/media/imx/imx-media-csi.c +1 -1
index f1d7fce8c020..a7cd3ef95fc3 100644

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

drivers/staging/rtl8723bs/core/rtw_cmd.c +4 -4
index 1c9e8b01d9d8..eedcf9d7357c 100644

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

drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
index 58de0c2fdd68..6ac05fce48a2 100644

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

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -4
index 3d36b6f005e0..6df037af304a 100644

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

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +2 -2
index c60e179bb2e1..293e5fa2c608 100644

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

drivers/staging/rtl8723bs/core/rtw_recv.c +2 -2
index 895116e9f4e7..cb3c7b8ed20f 100644

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

drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index 2080408743ef..0e90cfd472a1 100644

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

drivers/staging/rtl8723bs/os_dep/mlme_linux.c +2 -2
index 1904e82a24b5..fd4ae870a617 100644

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

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

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

drivers/target/iscsi/iscsi_target_erl1.c +1 -1
index e7c3c4cdaae4..d8ca06e697d6 100644

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

drivers/target/iscsi/iscsi_target_util.c +3 -3
index 0bd62ab9a1cd..a607366f9d2a 100644

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

drivers/target/target_core_user.c +2 -2
index 43872ccc07cc..3fd963612775 100644

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

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

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

drivers/tty/mips_ejtag_fdc.c +1 -1
index fa47bfcf9e86..9c5d4ff8875c 100644

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

drivers/tty/n_gsm.c +4 -4
index 40a336ef8c7e..7fc535452c0b 100644

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

drivers/tty/serial/8250/8250_aspeed_vuart.c +1 -1
index 392447038bfb..8c25ef774566 100644

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

drivers/tty/serial/8250/8250_core.c +2 -2
index 5a56f853cf6d..a7e09fa7df94 100644

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

drivers/tty/serial/altera_uart.c +1 -1
index 011f38681131..837991dc4db9 100644

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

drivers/tty/serial/amba-pl011.c +1 -1
index 11d65097578c..6b870db7230d 100644

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

drivers/tty/serial/atmel_serial.c +1 -1
index 18dba502144d..3b4fb5f8a1d1 100644

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

drivers/tty/serial/fsl_lpuart.c +1 -1
index fe5aed99d55a..8243f9168f4c 100644

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

drivers/tty/serial/imx.c +1 -1
index e4b6f1bfdc95..bd02ee898f5d 100644

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

drivers/tty/serial/liteuart.c +1 -1
index 3a0960c97c77..6429e8f11f36 100644

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

drivers/tty/serial/max3100.c +1 -1
index f2dd83692b2c..52ab244c2515 100644

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

drivers/tty/serial/sa1100.c +1 -1
index 8587ebbe1073..72b1bb76415c 100644

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

drivers/tty/serial/sccnxp.c +1 -1
index 553e3c1321ca..4ceca11ce600 100644

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

drivers/tty/serial/sh-sci.c +1 -1
index 7e7813ccda41..791e59a4e4ea 100644

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

drivers/tty/synclink_gt.c +2 -2
index 4c703f42680d..3865b10d2d43 100644

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

drivers/tty/sysrq.c +1 -1
index 6853c4660e7c..a52d77ca5314 100644

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

drivers/tty/vcc.c +2 -2
index 7ac3048377d5..2960031ace72 100644

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

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

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

drivers/usb/atm/speedtch.c +2 -2
index 27e3d35ee7dd..2f379479d8c4 100644

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

drivers/usb/atm/usbatm.c +1 -1
index a6a05e85ef8c..5f3ad9a99d9e 100644

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

drivers/usb/core/hcd.c +1 -1
index a63c793bac21..c22de97432a0 100644

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

drivers/usb/core/hub.c +1 -1
index 0e1dd6ef60a7..340c23509d07 100644

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

drivers/usb/dwc2/hcd.c +1 -1
index 60ef8092259a..30eb8506617c 100644

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

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

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

drivers/usb/gadget/udc/at91_udc.c +1 -1
index aa4c61094dc6..42b94d858e37 100644

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

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

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

drivers/usb/gadget/udc/m66592-udc.c +1 -1
index a938b2af0944..715791737499 100644

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

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

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

drivers/usb/gadget/udc/pxa25x_udc.c +1 -1
index 24eb1ae78e45..f5d09a91e554 100644

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

drivers/usb/gadget/udc/r8a66597-udc.c +1 -1
index 6c1d15b2250c..e5c2630e3711 100644

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

drivers/usb/host/ehci-platform.c +1 -1
index 150d2542cef0..4f69c7231515 100644

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

drivers/usb/host/ohci-hcd.c +1 -1
index c7784bf8101d..5c662f8e7896 100644

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

drivers/usb/host/oxu210hp-hcd.c +1 -1
index d75b1b9b4db0..6b7c73eff081 100644

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

drivers/usb/host/r8a66597-hcd.c +3 -3
index 67e472116d11..8b71f45ef985 100644

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

drivers/usb/host/sl811-hcd.c +1 -1
index 718b1b7fe366..ea3cab99c5d4 100644

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

drivers/usb/host/uhci-q.c +1 -1
index 45a8256a665f..9480d4ff0111 100644

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

drivers/usb/host/xen-hcd.c +1 -1
index 05943f2213e4..1c2a95fe41e5 100644

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

drivers/usb/host/xhci.c +1 -1
index 0452b8d65832..0244d2854372 100644

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

drivers/usb/isp1760/isp1760-udc.c +1 -1
index 2af89ee28baa..65ac91d0595a 100644

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

drivers/usb/misc/usbtest.c +1 -1
index 853a5f082a70..63dba8e344f7 100644

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

drivers/usb/musb/da8xx.c +1 -1
index eebb24ab3ec8..65ab223a2939 100644

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

drivers/usb/musb/mpfs.c +1 -1
index 020348a98514..3e96893bba4a 100644

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

drivers/usb/musb/musb_core.c +1 -1
index cbbb27178024..c7234b236971 100644

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

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

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

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

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

drivers/usb/phy/phy-mv-usb.c +1 -1
index 638fba58420c..24b8ea50fb86 100644

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

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

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

drivers/usb/serial/mos7840.c +2 -2
index 93710b762893..9e9aca271c0a 100644

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

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

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

drivers/usb/usbip/vudc_transfer.c +1 -1
index 7e801fee33bf..a4f02ea3e3ef 100644

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

drivers/video/fbdev/aty/radeon_base.c +1 -1
index c6c4753f6415..0eef8c6b98c8 100644

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

drivers/virt/vboxguest/vboxguest_core.c +1 -1
index f1674f3ed923..b177a534b6a4 100644

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

drivers/watchdog/at91sam9_wdt.c +1 -1
index 1b47a2fc7d17..aba66b8e9d03 100644

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

drivers/watchdog/bcm47xx_wdt.c +1 -1
index 4c0951307421..e13ec0975bef 100644

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

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

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

drivers/watchdog/shwdt.c +1 -1
index 95af9ad94d16..719f100aae60 100644

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

fs/dlm/lock.c +1 -1
index e01d5f29f4d2..6dd3a524cd35 100644

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

fs/ext4/super.c +1 -1
index 181934499624..c16419e8f5ef 100644

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

fs/jbd2/journal.c +1 -1
index 743a1d7633cd..f64549c5e0cb 100644

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

fs/nilfs2/segment.c +1 -1
index 83970d97840b..34a075155965 100644

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

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

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

include/linux/timer.h +1 -1
index 5944cfb196c5..c39a0df72407 100644

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

kernel/kthread.c +1 -1
index 77c44924cf54..07370e74ebf1 100644

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

kernel/rcu/tasks.h +1 -1
index c0cc7ae41106..7982183ef279 100644

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

kernel/rcu/tree_nocb.h +1 -1
index fa269d34167a..3fffd29e1f99 100644

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

kernel/sched/psi.c +1 -1
index 1396674fa722..ad04a5c3162a 100644

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

kernel/time/sleep_timeout.c +1 -1
index bd30d354f558..4873eceb85ce 100644

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

kernel/workqueue.c +3 -3
index b0e53d3e56c7..5eb43f2d213b 100644

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

mm/page-writeback.c +2 -2
index c81624bc3969..96c12e7cf77e 100644

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

net/802/garp.c +1 -1
index 27f0ab146026..2d1ffc4d9462 100644

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

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

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

net/appletalk/ddp.c +1 -1
index b068651984fe..73ea7e67f05a 100644

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

net/atm/lec.c +2 -2
index ded2f0df2ee6..97c6a1b9ca89 100644

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

net/ax25/af_ax25.c +1 -1
index b790bb92ed1c..6ef8b2a57a9b 100644

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

net/ax25/ax25_ds_timer.c +1 -1
index 8d9fba069001..0c9e7775aa54 100644

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

net/ax25/ax25_timer.c +5 -5
index 3891a3923d6c..a69bfbc8b679 100644

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

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

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

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

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

net/bluetooth/rfcomm/core.c +2 -2
index 20ea7dba0a9a..3b8f39618d65 100644

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

net/bridge/br_multicast.c +14 -14
index dcbf058de1e3..3e61a2798d63 100644

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

net/bridge/br_multicast_eht.c +2 -2
index c126aa4e7551..46c117615f04 100644

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

net/bridge/br_stp_timer.c +6 -6
index 27bf1979b909..8e283779a4cc 100644

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

net/can/proc.c +1 -1
index 25fdf060e30d..0938bf7dd646 100644

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

net/core/drop_monitor.c +1 -1
index 8a7ce640f74d..60d31c2feed3 100644

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

net/core/gen_estimator.c +1 -1
index 2b821b9a8699..7d426a8e29f3 100644

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

net/core/neighbour.c +2 -2
index a07249b59ae1..fed79161f41f 100644

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

net/dccp/ccids/ccid2.c +1 -1
index d6b30700af67..440eefa4ecc2 100644

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

net/dccp/ccids/ccid3.c +1 -1
index f349d16dd8f6..758002fe63a7 100644

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

net/dccp/timer.c +4 -4
index 232ac4ae0a73..827eacf839a1 100644

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

net/hsr/hsr_device.c +2 -2
index 1b1b700ec05e..523b60efd639 100644

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

net/hsr/hsr_framereg.c +2 -2
index 4ce471a2f387..3a2a2fa7a0a3 100644

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

net/ieee802154/6lowpan/reassembly.c +1 -1
index d4b983d17038..ddb6a5817d09 100644

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

net/ipv4/igmp.c +3 -3
index ca7d539b3846..d1769034b643 100644

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

net/ipv4/inet_connection_sock.c +3 -3
index dd5cf8914a28..c437a1c2c6ac 100644

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

net/ipv4/inet_timewait_sock.c +1 -1
index aded4bf1bc16..2f75c2e73aac 100644

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

net/ipv4/ip_fragment.c +1 -1
index 77f395b28ec7..64b3fb3208af 100644

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

net/ipv4/ipmr.c +1 -1
index a8b04d4abcaa..5f1c7adf6680 100644

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

net/ipv4/tcp_timer.c +3 -3
index e4c616bbd727..bb37e24b97a7 100644

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

net/ipv6/addrconf.c +1 -1
index 9ba83f0c9928..39cfe7a8c2bc 100644

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

net/ipv6/ip6_fib.c +1 -1
index bf727149fdec..5216b8b6314a 100644

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

net/ipv6/ip6mr.c +1 -1
index b413c9c8a21c..93eff77c621a 100644

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

net/ipv6/netfilter/nf_conntrack_reasm.c +1 -1
index d6bd8f7079bb..64ab23ff559b 100644

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

net/ipv6/reassembly.c +1 -1
index 49740898bc13..7d4bcf3fda5b 100644

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

net/lapb/lapb_timer.c +2 -2
index 5b3f3b444d19..9fde6cf20f10 100644

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

net/llc/llc_c_ac.c +4 -4
index 7e8fc710c590..8be393ccfc22 100644

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

net/mac80211/agg-rx.c +2 -2
index 85612234742a..e1d9e02f752b 100644

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

net/mac80211/agg-tx.c +2 -2
index 8dc8c3c96b96..a99b3868fea7 100644

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

net/mac80211/ibss.c +1 -1
index 4246d168374f..86ef9a858eb4 100644

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

net/mac80211/led.c +1 -1
index 885fa6aa3fc1..2e10136b3e70 100644

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

net/mac80211/mesh.c +3 -3
index 7257f5610af5..b17f5b75d699 100644

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

net/mac80211/mesh_hwmp.c +1 -1
index c94a9c7ca960..2666ee263731 100644

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

net/mac80211/mesh_plink.c +1 -1
index 96e0a861886a..4fe05d640953 100644

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

net/mac80211/mlme.c +4 -4
index 5d1f2d6d09ad..04f29c89bfb6 100644

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

net/mac80211/ocb.c +1 -1
index ece1e83c7b2f..a5d4358f122a 100644

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

net/mac80211/sta_info.c +1 -1
index 248e1f63bf73..02de319b45db 100644

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

net/mptcp/pm.c +1 -1
index 31747f974941..2475b3975813 100644

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

net/mptcp/protocol.c +2 -2
index 44f7ab463d75..d90365db63be 100644

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

net/ncsi/ncsi-manage.c +2 -2
index b36947063783..446e4e3b9553 100644

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

net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
index 6ae042f702d2..798c7993635e 100644

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

net/netfilter/ipset/ip_set_list_set.c +1 -1
index db794fe1300e..13c7a08aa868 100644

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

net/netfilter/ipvs/ip_vs_conn.c +1 -1
index 8699944c0baf..44b2ad695c15 100644

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

net/netfilter/ipvs/ip_vs_ctl.c +1 -1
index 7d5b7418f8c7..fdc8ef0a0db2 100644

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

net/netfilter/ipvs/ip_vs_lblc.c +1 -1
index 2423513d701d..f15377c4c5df 100644

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

net/netfilter/ipvs/ip_vs_lblcr.c +1 -1
index cdb1d4bf6761..7efaf82090fd 100644

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

net/netfilter/nf_conntrack_expect.c +1 -1
index 21d22fa22e4e..cfc2daa3fc7f 100644

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

net/netfilter/nfnetlink_log.c +1 -1
index 882962f3c84d..bfcb9cd335bf 100644

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

net/netfilter/xt_IDLETIMER.c +1 -1
index 9f54819eb52c..7f20e517da62 100644

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

net/netfilter/xt_LED.c +1 -1
index 8a80fd76fe45..3dd733b293fe 100644

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

net/netrom/af_netrom.c +1 -1
index 6ee148f0e6d0..3331669d8e33 100644

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

net/netrom/nr_timer.c +5 -5
index 5e3ca068f04e..b3a62b1f3a09 100644

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

net/nfc/core.c +1 -1
index 75ed8a9146ba..ae1c842f9c64 100644

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

net/nfc/hci/core.c +1 -1
index aa493344d93e..8618d57c23da 100644

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

net/nfc/hci/llc_shdlc.c +3 -3
index ce9c683a3ead..4fc37894860c 100644

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

net/nfc/llcp_core.c +2 -2
index 27e863f96ed1..73282f5f6d83 100644

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

net/nfc/nci/core.c +2 -2
index 0171bf3c7016..fc921cd2cdff 100644

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

net/packet/af_packet.c +1 -1
index d4dba06297c3..bafc1ee7ccfa 100644

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

net/rose/af_rose.c +1 -1
index a4a668b88a8f..4e72b636a46a 100644

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

net/rose/rose_link.c +1 -1
index 9f9629e6fdae..7746229fdc8c 100644

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

net/rose/rose_timer.c +3 -3
index 1525773e94aa..020369c49587 100644

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

net/rxrpc/call_object.c +1 -1
index fce58be65e7c..645ac6b4a767 100644

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

net/sched/cls_flow.c +1 -1
index 5c2580a07530..5693b41b093f 100644

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

net/sched/sch_fq_pie.c +1 -1
index f3b8203d3e85..98f8765ec5d4 100644

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

net/sched/sch_generic.c +1 -1
index 514b1b6ac681..a78945a7073a 100644

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

net/sched/sch_pie.c +1 -1
index 3771d000b30d..d5caa6d5cd5b 100644

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

net/sched/sch_red.c +1 -1
index 1ba3e0bba54f..339d70b4a4c5 100644

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

net/sched/sch_sfq.c +1 -1
index b912ad99aa15..a8081492d671 100644

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

net/sctp/protocol.c +1 -1
index 8c3b80c4d40b..f402f90eb6b6 100644

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

net/sctp/sm_sideeffect.c +12 -12
index 3aa5da5e3bbd..6c24ac6d3bf1 100644

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

net/sunrpc/svc_xprt.c +1 -1
index ae25405d8bd2..144fdc4cd322 100644

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

net/sunrpc/xprt.c +1 -1
index 0eab15465511..002380569762 100644

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

net/tipc/discover.c +1 -1
index 685389d4b245..775fd4f3f072 100644

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

net/tipc/monitor.c +1 -1
index e2f19627e43d..2f266a064663 100644

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

net/tipc/node.c +1 -1
index ccf5e427f43e..32afc0bdfd0c 100644

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

net/tipc/socket.c +1 -1
index 65dcbb54f55d..7c61d47ea208 100644

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

net/tipc/subscr.c +1 -1
index 621addab2834..f8490d94e323 100644

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

net/wireless/core.c +1 -1
index dcce326fdb8c..5c3c72df0591 100644

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

net/x25/af_x25.c +1 -1
index 8dda4178497c..1f8ae9f4a3f1 100644

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

net/x25/x25_link.c +1 -1
index 37b190499405..4608aa5b4f31 100644

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

net/x25/x25_timer.c +2 -2
index e4c5ad5b070f..2ec63a1f4c6d 100644

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

net/xfrm/xfrm_policy.c +2 -2
index 143ac3aa7537..59d0bd5e80ec 100644

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

net/xfrm/xfrm_state.c +1 -1
index 341d79ecb5c2..767ec3681de4 100644

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

sound/core/timer.c +1 -1
index 1de4b90fd4d1..5bf5bddfd82a 100644

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

sound/drivers/aloop.c +1 -1
index 4b02ec127cc0..6c318a5903ab 100644

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

sound/drivers/dummy.c +1 -1
index 1d923cbe8cd0..783fe3a22bc9 100644

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

sound/drivers/mpu401/mpu401_uart.c +1 -1
index a63e7558ac07..670f8ba92c08 100644

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

sound/drivers/mtpav.c +1 -1
index dffcdf9e10d4..851f34e2cdd0 100644

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

sound/drivers/opl3/opl3_midi.c +1 -1
index 9bee454441b0..de7449cb6515 100644

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

sound/drivers/pcmtest.c +1 -1
index 72378f354fd0..39f1e1fe4c44 100644

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

sound/drivers/serial-u16550.c +1 -1
index 1857a78f55d7..6d0656fcd574 100644

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

sound/i2c/other/ak4117.c +1 -1
index 657b331d7a79..cd380db195ef 100644

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

sound/isa/sb/emu8000_pcm.c +1 -1
index 016235209928..215bbcd0360e 100644

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

sound/isa/sb/sb8_midi.c +1 -1
index d2908fc280f8..25caf23273bc 100644

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

sound/isa/wavefront/wavefront_midi.c +1 -1
index fcc2a0d67792..494b21be665c 100644

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

sound/pci/asihpi/asihpi.c +1 -1
index 65100f925b72..0fcb416c26cb 100644

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

sound/pci/ctxfi/cttimer.c +1 -1
index 89e47fa14f70..56bf567d98b1 100644

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

sound/pci/echoaudio/midi.c +1 -1
index 2ef59184249c..c3f3c9129561 100644

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

sound/pci/korg1212/korg1212.c +1 -1
index 49b71082c485..aef44a88d545 100644

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

sound/pci/rme9652/hdsp.c +1 -1
index dc326face54a..e4b059000def 100644

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

sound/pci/rme9652/hdspm.c +1 -1
index 1935de046f00..bcf068e95fda 100644

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

sound/sh/aica.c +1 -1
index 5a93f4587356..b0f8f1d083e0 100644

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

sound/soc/codecs/rt5645.c +1 -1
index dba78efadc85..7d1d8773c76d 100644

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

sound/soc/fsl/imx-pcm-rpmsg.c +1 -1
index de5f87600fac..ea445a6191ed 100644

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

sound/synth/emux/emux_synth.c +1 -1
index 02e2c69d7f18..cff6aba9bfc3 100644

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

sound/usb/midi.c +1 -1
index dcdd7e9e1ae9..a231b3f51f90 100644

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

tools/sched_ext/scx_qmap.bpf.c +2 -2
index 26c40ca4f36c..096ef358ad67 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.

#15 lore raw

PATCH 6/17 treewide, timers: Rename mod_timer_pending() => timer_mod_pending()

In reply to Ingo Molnar

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

---
 drivers/dma/ioat/dma.c                 | 6 +++---
 drivers/net/xen-netback/xenbus.c       | 2 +-
 include/linux/timer.h                  | 2 +-
 kernel/time/timer.c                    | 8 ++++----
 net/ipv4/inet_timewait_sock.c          | 2 +-
 net/ipv4/tcp_minisocks.c               | 2 +-
 net/netfilter/ipvs/ip_vs_conn.c        | 4 ++--
 net/netfilter/nf_conntrack_h323_main.c | 2 +-
 net/netfilter/nf_conntrack_sip.c       | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)
drivers/dma/ioat/dma.c +3 -3
index d29f1b55ba8b..f5f5f221db42 100644
@@ -656,7 +656,7 @@ static void __ioat_cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_compl
 	if (active - i == 0) {
 		dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n",
 			__func__);
-		mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
+		timer_mod_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
 	}
 
 	/* microsecond delay by sysfs variable  per pending descriptor */
@@ -682,7 +682,7 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan)
 
 		if (chanerr &
 		    (IOAT_CHANERR_HANDLE_MASK | IOAT_CHANERR_RECOVER_MASK)) {
-			mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
+			timer_mod_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
 			ioat_eh(ioat_chan);
 		}
 	}
@@ -879,7 +879,7 @@ static void check_active(struct ioatdma_chan *ioat_chan)
 	}
 
 	if (test_and_clear_bit(IOAT_CHAN_ACTIVE, &ioat_chan->state))
-		mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
+		timer_mod_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
 }
 
 static void ioat_reboot_chan(struct ioatdma_chan *ioat_chan)
drivers/net/xen-netback/xenbus.c +1 -1
index a78a25b87240..28ec3c607c7c 100644
@@ -535,7 +535,7 @@ static void xen_net_rate_changed(struct xenbus_watch *watch,
 
 		queue->credit_bytes = credit_bytes;
 		queue->credit_usec = credit_usec;
-		if (!mod_timer_pending(&queue->credit_timeout, jiffies) &&
+		if (!timer_mod_pending(&queue->credit_timeout, jiffies) &&
 			queue->remaining_credit > queue->credit_bytes) {
 			queue->remaining_credit = queue->credit_bytes;
 		}
include/linux/timer.h +1 -1
index c39a0df72407..c35cf0c16095 100644
@@ -149,7 +149,7 @@ static inline int timer_pending(const struct timer_list * timer)
 
 extern void add_timer_on(struct timer_list *timer, int cpu);
 extern int mod_timer(struct timer_list *timer, unsigned long expires);
-extern int mod_timer_pending(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/time/timer.c +4 -4
index 3fd0b13c0b74..778c4b6e07c4 100644
@@ -1184,11 +1184,11 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
 }
 
 /**
- * mod_timer_pending - Modify a pending timer's timeout
+ * timer_mod_pending - Modify a pending timer's timeout
  * @timer:	The pending timer to be modified
  * @expires:	New absolute timeout in jiffies
  *
- * mod_timer_pending() is the same for pending timers as mod_timer(), but
+ * timer_mod_pending() is the same for pending timers as mod_timer(), but
  * will not activate inactive timers.
  *
  * If @timer->function == NULL then the start operation is silently
@@ -1199,11 +1199,11 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
  *	  shutdown state and the operation was discarded
  * * %1 - The timer was active and requeued to expire at @expires
  */
-int mod_timer_pending(struct timer_list *timer, unsigned long expires)
+int timer_mod_pending(struct timer_list *timer, unsigned long expires)
 {
 	return __mod_timer(timer, expires, MOD_TIMER_PENDING_ONLY);
 }
-EXPORT_SYMBOL(mod_timer_pending);
+EXPORT_SYMBOL(timer_mod_pending);
 
 /**
  * mod_timer - Modify a timer's timeout
net/ipv4/inet_timewait_sock.c +1 -1
index 2f75c2e73aac..663a4a915a54 100644
@@ -303,7 +303,7 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm)
 		BUG_ON(mod_timer(&tw->tw_timer, jiffies + timeo));
 		refcount_inc(&tw->tw_dr->tw_refcount);
 	} else {
-		mod_timer_pending(&tw->tw_timer, jiffies + timeo);
+		timer_mod_pending(&tw->tw_timer, jiffies + timeo);
 	}
 }
 EXPORT_SYMBOL_GPL(__inet_twsk_schedule);
net/ipv4/tcp_minisocks.c +1 -1
index fb9349be36b8..e7c46dea7a88 100644
@@ -728,7 +728,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
 
 			expires += reqsk_timeout(req, TCP_RTO_MAX);
 			if (!fastopen)
-				mod_timer_pending(&req->rsk_timer, expires);
+				timer_mod_pending(&req->rsk_timer, expires);
 			else
 				req->rsk_timer.expires = expires;
 		}
net/netfilter/ipvs/ip_vs_conn.c +2 -2
index 44b2ad695c15..6e13e8dba00b 100644
@@ -925,12 +925,12 @@ static void ip_vs_conn_expire(struct timer_list *t)
  */
 void ip_vs_conn_expire_now(struct ip_vs_conn *cp)
 {
-	/* Using mod_timer_pending will ensure the timer is not
+	/* Using timer_mod_pending will ensure the timer is not
 	 * modified after the final del_timer in ip_vs_conn_expire.
 	 */
 	if (timer_pending(&cp->timer) &&
 	    time_after(cp->timer.expires, jiffies))
-		mod_timer_pending(&cp->timer, jiffies);
+		timer_mod_pending(&cp->timer, jiffies);
 }
 
 
net/netfilter/nf_conntrack_h323_main.c +1 -1
index 14f73872f647..ad887033cba8 100644
@@ -1396,7 +1396,7 @@ static int process_rcf(struct sk_buff *skb, struct nf_conn *ct,
 				 "timeout to %u seconds for",
 				 info->timeout);
 			nf_ct_dump_tuple(&exp->tuple);
-			mod_timer_pending(&exp->timeout,
+			timer_mod_pending(&exp->timeout,
 					  jiffies + info->timeout * HZ);
 		}
 		spin_unlock_bh(&nf_conntrack_expect_lock);
net/netfilter/nf_conntrack_sip.c +1 -1
index ca748f8dbff1..b11d1815bc4d 100644
@@ -815,7 +815,7 @@ static int refresh_signalling_expectation(struct nf_conn *ct,
 		    exp->tuple.dst.protonum != proto ||
 		    exp->tuple.dst.u.udp.port != port)
 			continue;
-		if (mod_timer_pending(&exp->timeout, jiffies + expires * HZ)) {
+		if (timer_mod_pending(&exp->timeout, jiffies + expires * HZ)) {
 			exp->flags &= ~NF_CT_EXPECT_INACTIVE;
 			found = 1;
 			break;
Signature · 1 line
2.45.2
#16 lore raw

PATCH 7/17 treewide, timers: Rename try_to_del_timer_sync() => timer_delete_sync_try()

In reply to Ingo Molnar

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

---
 arch/x86/kernel/apic/vector.c           |  2 +-
 drivers/char/random.c                   |  4 ++--
 drivers/irqchip/irq-riscv-imsic-state.c |  2 +-
 include/linux/timer.h                   |  2 +-
 kernel/time/timer.c                     |  6 +++---
 net/bridge/br_multicast.c               | 16 ++++++++--------
 sound/pci/ctxfi/cttimer.c               |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)
arch/x86/kernel/apic/vector.c +1 -1
index fee42a73d64a..93069b13d3af 100644
@@ -864,7 +864,7 @@ void lapic_offline(void)
 	__vector_cleanup(cl, false);
 
 	irq_matrix_offline(vector_matrix);
-	WARN_ON_ONCE(try_to_del_timer_sync(&cl->timer) < 0);
+	WARN_ON_ONCE(timer_delete_sync_try(&cl->timer) < 0);
 	WARN_ON_ONCE(!hlist_empty(&cl->head));
 
 	unlock_vector_lock();
drivers/char/random.c +2 -2
index 38f2fab29c56..4ea4dccc7c46 100644
@@ -1311,9 +1311,9 @@ static void __cold try_to_generate_entropy(void)
 	while (!crng_ready() && !signal_pending(current)) {
 		/*
 		 * Check !timer_pending() and then ensure that any previous callback has finished
-		 * executing by checking try_to_del_timer_sync(), before queueing the next one.
+		 * executing by checking timer_delete_sync_try(), before queueing the next one.
 		 */
-		if (!timer_pending(&stack->timer) && try_to_del_timer_sync(&stack->timer) >= 0) {
+		if (!timer_pending(&stack->timer) && timer_delete_sync_try(&stack->timer) >= 0) {
 			struct cpumask timer_cpus;
 			unsigned int num_cpus;
 
drivers/irqchip/irq-riscv-imsic-state.c +1 -1
index bdf5cd2037f2..c39e573825d4 100644
@@ -564,7 +564,7 @@ void imsic_state_offline(void)
 	struct imsic_local_priv *lpriv = this_cpu_ptr(imsic->lpriv);
 
 	raw_spin_lock_irqsave(&lpriv->lock, flags);
-	WARN_ON_ONCE(try_to_del_timer_sync(&lpriv->timer) < 0);
+	WARN_ON_ONCE(timer_delete_sync_try(&lpriv->timer) < 0);
 	raw_spin_unlock_irqrestore(&lpriv->lock, flags);
 #endif
 }
include/linux/timer.h +1 -1
index c35cf0c16095..f662aca5d536 100644
@@ -162,7 +162,7 @@ extern void add_timer(struct timer_list *timer);
 extern void timer_add_local(struct timer_list *timer);
 extern void timer_add_global(struct timer_list *timer);
 
-extern int try_to_del_timer_sync(struct timer_list *timer);
+extern int timer_delete_sync_try(struct timer_list *timer);
 extern int timer_delete_sync(struct timer_list *timer);
 extern int timer_delete(struct timer_list *timer);
 extern int timer_shutdown_sync(struct timer_list *timer);
kernel/time/timer.c +3 -3
index 778c4b6e07c4..74c1383e887f 100644
@@ -1511,7 +1511,7 @@ static int __try_to_del_timer_sync(struct timer_list *timer, bool shutdown)
 }
 
 /**
- * try_to_del_timer_sync - Try to deactivate a timer
+ * timer_delete_sync_try - Try to deactivate a timer
  * @timer:	Timer to deactivate
  *
  * This function tries to deactivate a timer. On success the timer is not
@@ -1526,11 +1526,11 @@ static int __try_to_del_timer_sync(struct timer_list *timer, bool shutdown)
  * * %1  - The timer was pending and deactivated
  * * %-1 - The timer callback function is running on a different CPU
  */
-int try_to_del_timer_sync(struct timer_list *timer)
+int timer_delete_sync_try(struct timer_list *timer)
 {
 	return __try_to_del_timer_sync(timer, false);
 }
-EXPORT_SYMBOL(try_to_del_timer_sync);
+EXPORT_SYMBOL(timer_delete_sync_try);
 
 #ifdef CONFIG_PREEMPT_RT
 static __init void timer_base_init_expiry_lock(struct timer_base *base)
net/bridge/br_multicast.c +8 -8
index 3e61a2798d63..bf7e52b2bb13 100644
@@ -2061,7 +2061,7 @@ static void br_multicast_enable(struct bridge_mcast_own_query *query)
 {
 	query->startup_sent = 0;
 
-	if (try_to_del_timer_sync(&query->timer) >= 0 ||
+	if (timer_delete_sync_try(&query->timer) >= 0 ||
 	    timer_delete(&query->timer))
 		mod_timer(&query->timer, jiffies);
 }
@@ -3480,7 +3480,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
 	if (mp->host_joined &&
 	    (timer_pending(&mp->timer) ?
 	     time_after(mp->timer.expires, now + max_delay) :
-	     try_to_del_timer_sync(&mp->timer) >= 0))
+	     timer_delete_sync_try(&mp->timer) >= 0))
 		mod_timer(&mp->timer, now + max_delay);
 
 	for (pp = &mp->ports;
@@ -3488,7 +3488,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
 	     pp = &p->next) {
 		if (timer_pending(&p->timer) ?
 		    time_after(p->timer.expires, now + max_delay) :
-		    try_to_del_timer_sync(&p->timer) >= 0 &&
+		    timer_delete_sync_try(&p->timer) >= 0 &&
 		    (brmctx->multicast_igmp_version == 2 ||
 		     p->filter_mode == MCAST_EXCLUDE))
 			mod_timer(&p->timer, now + max_delay);
@@ -3569,7 +3569,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
 	if (mp->host_joined &&
 	    (timer_pending(&mp->timer) ?
 	     time_after(mp->timer.expires, now + max_delay) :
-	     try_to_del_timer_sync(&mp->timer) >= 0))
+	     timer_delete_sync_try(&mp->timer) >= 0))
 		mod_timer(&mp->timer, now + max_delay);
 
 	for (pp = &mp->ports;
@@ -3577,7 +3577,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
 	     pp = &p->next) {
 		if (timer_pending(&p->timer) ?
 		    time_after(p->timer.expires, now + max_delay) :
-		    try_to_del_timer_sync(&p->timer) >= 0 &&
+		    timer_delete_sync_try(&p->timer) >= 0 &&
 		    (brmctx->multicast_mld_version == 1 ||
 		     p->filter_mode == MCAST_EXCLUDE))
 			mod_timer(&p->timer, now + max_delay);
@@ -3649,7 +3649,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,
 			if (!hlist_unhashed(&p->mglist) &&
 			    (timer_pending(&p->timer) ?
 			     time_after(p->timer.expires, time) :
-			     try_to_del_timer_sync(&p->timer) >= 0)) {
+			     timer_delete_sync_try(&p->timer) >= 0)) {
 				mod_timer(&p->timer, time);
 			}
 
@@ -3665,7 +3665,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,
 		if (mp->host_joined &&
 		    (timer_pending(&mp->timer) ?
 		     time_after(mp->timer.expires, time) :
-		     try_to_del_timer_sync(&mp->timer) >= 0)) {
+		     timer_delete_sync_try(&mp->timer) >= 0)) {
 			mod_timer(&mp->timer, time);
 		}
 
@@ -3681,7 +3681,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,
 		if (!hlist_unhashed(&p->mglist) &&
 		    (timer_pending(&p->timer) ?
 		     time_after(p->timer.expires, time) :
-		     try_to_del_timer_sync(&p->timer) >= 0)) {
+		     timer_delete_sync_try(&p->timer) >= 0)) {
 			mod_timer(&p->timer, time);
 		}
 
sound/pci/ctxfi/cttimer.c +1 -1
index 56bf567d98b1..fa6867adb42b 100644
@@ -119,7 +119,7 @@ static void ct_systimer_stop(struct ct_timer_instance *ti)
 static void ct_systimer_prepare(struct ct_timer_instance *ti)
 {
 	ct_systimer_stop(ti);
-	try_to_del_timer_sync(&ti->timer);
+	timer_delete_sync_try(&ti->timer);
 }
 
 #define ct_systimer_free	ct_systimer_prepare
Signature · 1 line
2.45.2
#17 lore raw

PATCH 8/17 treewide, timers: Rename add_timer() => timer_add()

In reply to Ingo Molnar

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

---
 Documentation/kernel-hacking/locking.rst           |  4 ++--
 Documentation/scsi/ChangeLog.lpfc                  |  2 +-
 .../translations/it_IT/kernel-hacking/locking.rst  |  4 ++--
 arch/alpha/kernel/process.c                        |  2 +-
 arch/arm/mach-footbridge/dc21285.c                 |  4 ++--
 arch/m68k/amiga/amisound.c                         |  2 +-
 arch/m68k/mac/macboing.c                           |  6 +++---
 arch/mips/sgi-ip22/ip22-reset.c                    |  6 +++---
 arch/mips/sgi-ip32/ip32-reset.c                    |  2 +-
 arch/powerpc/mm/book3s64/hash_utils.c              |  2 +-
 arch/powerpc/platforms/powermac/low_i2c.c          |  6 +++---
 arch/sh/drivers/pci/common.c                       |  2 +-
 arch/sh/drivers/pci/pci-sh7780.c                   |  2 +-
 arch/sparc/kernel/led.c                            |  2 +-
 arch/um/drivers/vector_kern.c                      |  2 +-
 arch/x86/kernel/tsc_sync.c                         |  2 +-
 block/blk-iocost.c                                 |  2 +-
 drivers/accel/qaic/qaic_timesync.c                 |  2 +-
 drivers/acpi/apei/ghes.c                           |  2 +-
 drivers/ata/libata-eh.c                            |  4 ++--
 drivers/atm/idt77105.c                             |  4 ++--
 drivers/atm/idt77252.c                             |  2 +-
 drivers/atm/iphase.c                               |  4 ++--
 drivers/atm/lanai.c                                |  2 +-
 drivers/atm/nicstar.c                              |  2 +-
 drivers/atm/suni.c                                 |  2 +-
 drivers/auxdisplay/panel.c                         |  2 +-
 drivers/base/power/main.c                          |  2 +-
 drivers/block/amiflop.c                            |  8 ++++----
 drivers/block/aoe/aoecmd.c                         |  2 +-
 drivers/block/aoe/aoedev.c                         |  4 ++--
 drivers/block/drbd/drbd_receiver.c                 |  2 +-
 drivers/block/drbd/drbd_worker.c                   |  4 ++--
 drivers/block/floppy.c                             |  2 +-
 drivers/block/swim3.c                              |  2 +-
 drivers/char/hw_random/xgene-rng.c                 |  2 +-
 drivers/char/ipmi/bt-bmc.c                         |  4 ++--
 drivers/comedi/drivers/comedi_test.c               |  4 ++--
 drivers/comedi/drivers/das16.c                     |  2 +-
 drivers/comedi/drivers/jr3_pci.c                   |  4 ++--
 drivers/gpu/drm/xe/xe_execlist.c                   |  4 ++--
 drivers/greybus/operation.c                        |  2 +-
 drivers/hwmon/npcm750-pwm-fan.c                    |  4 ++--
 drivers/infiniband/hw/cxgb4/cm.c                   |  2 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  2 +-
 drivers/infiniband/hw/hfi1/driver.c                |  2 +-
 drivers/infiniband/hw/hfi1/tid_rdma.c              |  4 ++--
 drivers/infiniband/hw/irdma/cm.c                   |  4 ++--
 drivers/infiniband/hw/irdma/utils.c                |  2 +-
 drivers/infiniband/hw/mthca/mthca_catas.c          |  2 +-
 drivers/infiniband/hw/qib/qib_driver.c             |  2 +-
 drivers/infiniband/hw/qib/qib_iba6120.c            |  4 ++--
 drivers/infiniband/hw/qib/qib_iba7220.c            |  6 +++---
 drivers/infiniband/hw/qib/qib_iba7322.c            |  6 +++---
 drivers/infiniband/hw/qib/qib_mad.c                |  2 +-
 drivers/infiniband/hw/qib/qib_sd7220.c             |  2 +-
 drivers/infiniband/hw/qib/qib_tx.c                 |  2 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |  2 +-
 drivers/input/serio/hp_sdc.c                       |  2 +-
 drivers/isdn/hardware/mISDN/hfcpci.c               |  6 +++---
 drivers/isdn/hardware/mISDN/mISDNipac.c            |  2 +-
 drivers/isdn/hardware/mISDN/mISDNisar.c            |  2 +-
 drivers/isdn/hardware/mISDN/w6692.c                |  2 +-
 drivers/isdn/mISDN/dsp_cmx.c                       |  2 +-
 drivers/isdn/mISDN/dsp_core.c                      |  2 +-
 drivers/isdn/mISDN/dsp_tones.c                     |  4 ++--
 drivers/isdn/mISDN/fsm.c                           |  4 ++--
 drivers/isdn/mISDN/l1oip_core.c                    |  2 +-
 drivers/isdn/mISDN/timerdev.c                      |  2 +-
 drivers/leds/trigger/ledtrig-pattern.c             |  2 +-
 drivers/md/bcache/stats.c                          |  4 ++--
 drivers/md/dm-raid1.c                              |  2 +-
 drivers/media/dvb-core/dmxdev.c                    |  2 +-
 drivers/media/i2c/tc358743.c                       |  2 +-
 drivers/media/pci/bt8xx/bttv-input.c               |  2 +-
 drivers/media/pci/ivtv/ivtv-irq.c                  |  6 +++---
 drivers/media/pci/saa7134/saa7134-input.c          |  2 +-
 drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c   |  4 ++--
 .../platform/st/sti/c8sectpfe/c8sectpfe-core.c     |  4 ++--
 drivers/media/radio/radio-cadet.c                  |  4 ++--
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            | 10 +++++-----
 drivers/misc/cardreader/rtsx_usb.c                 |  2 +-
 drivers/misc/sgi-xp/xpc.h                          |  2 +-
 drivers/misc/sgi-xp/xpc_main.c                     |  2 +-
 drivers/misc/sgi-xp/xpc_partition.c                |  2 +-
 drivers/mmc/host/vub300.c                          |  6 +++---
 drivers/most/most_usb.c                            |  2 +-
 drivers/net/eql.c                                  |  4 ++--
 drivers/net/ethernet/3com/3c515.c                  |  2 +-
 drivers/net/ethernet/3com/3c574_cs.c               |  6 +++---
 drivers/net/ethernet/3com/3c589_cs.c               |  4 ++--
 drivers/net/ethernet/8390/axnet_cs.c               |  4 ++--
 drivers/net/ethernet/8390/pcnet_cs.c               |  4 ++--
 drivers/net/ethernet/agere/et131x.c                |  2 +-
 drivers/net/ethernet/amd/amd8111e.c                |  2 +-
 drivers/net/ethernet/apple/bmac.c                  |  2 +-
 drivers/net/ethernet/apple/mace.c                  |  2 +-
 drivers/net/ethernet/broadcom/b44.c                |  2 +-
 drivers/net/ethernet/broadcom/bcm63xx_enet.c       |  4 ++--
 drivers/net/ethernet/broadcom/tg3.c                |  4 ++--
 drivers/net/ethernet/dec/tulip/21142.c             |  6 +++---
 drivers/net/ethernet/dec/tulip/de2104x.c           |  8 ++++----
 drivers/net/ethernet/dec/tulip/dmfe.c              |  8 ++++----
 drivers/net/ethernet/dec/tulip/pnic2.c             |  6 +++---
 drivers/net/ethernet/dec/tulip/timer.c             |  4 ++--
 drivers/net/ethernet/dec/tulip/tulip_core.c        |  2 +-
 drivers/net/ethernet/dec/tulip/uli526x.c           |  6 +++---
 drivers/net/ethernet/dec/tulip/winbond-840.c       |  4 ++--
 drivers/net/ethernet/dlink/dl2k.c                  |  6 +++---
 drivers/net/ethernet/fealnx.c                      |  6 +++---
 drivers/net/ethernet/marvell/mv643xx_eth.c         |  4 ++--
 drivers/net/ethernet/marvell/pxa168_eth.c          |  2 +-
 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/micrel/ksz884x.c              |  6 +++---
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |  2 +-
 drivers/net/ethernet/natsemi/natsemi.c             |  2 +-
 drivers/net/ethernet/packetengines/hamachi.c       |  4 ++--
 drivers/net/ethernet/packetengines/yellowfin.c     |  4 ++--
 drivers/net/ethernet/realtek/atp.c                 |  4 ++--
 drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |  4 ++--
 drivers/net/ethernet/seeq/ether3.c                 |  2 +-
 drivers/net/ethernet/sgi/ioc3-eth.c                |  4 ++--
 drivers/net/ethernet/sis/sis190.c                  |  2 +-
 drivers/net/ethernet/sis/sis900.c                  |  4 ++--
 drivers/net/ethernet/smsc/epic100.c                |  4 ++--
 drivers/net/ethernet/smsc/smc91c92_cs.c            |  4 ++--
 drivers/net/ethernet/sun/niu.c                     | 10 +++++-----
 drivers/net/ethernet/sun/sunbmac.c                 |  4 ++--
 drivers/net/ethernet/sun/sunhme.c                  |  4 ++--
 drivers/net/ethernet/ti/cpsw_ale.c                 |  4 ++--
 drivers/net/ethernet/ti/netcp_ethss.c              |  4 ++--
 drivers/net/ethernet/ti/tlan.c                     | 12 ++++++------
 drivers/net/fddi/defza.c                           |  4 ++--
 drivers/net/hamradio/scc.c                         |  8 ++++----
 drivers/net/hamradio/yam.c                         |  4 ++--
 drivers/net/hippi/rrunner.c                        |  4 ++--
 drivers/net/slip/slip.c                            |  4 ++--
 drivers/net/usb/sierra_net.c                       |  2 +-
 drivers/net/wan/hdlc_cisco.c                       |  4 ++--
 drivers/net/wan/hdlc_fr.c                          |  4 ++--
 drivers/net/wan/hdlc_ppp.c                         |  2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  2 +-
 drivers/net/wireless/intel/ipw2x00/libipw_crypto.c |  4 ++--
 drivers/net/wireless/mediatek/mt76/mt7921/main.c   |  2 +-
 drivers/net/wireless/purelifi/plfxlc/usb.c         |  4 ++--
 drivers/net/wireless/rsi/rsi_91x_hal.c             |  2 +-
 drivers/net/wireless/rsi/rsi_91x_mac80211.c        |  2 +-
 drivers/pci/hotplug/cpqphp_ctrl.c                  |  4 ++--
 drivers/pci/hotplug/shpchp_hpc.c                   |  2 +-
 drivers/pcmcia/i82365.c                            |  4 ++--
 drivers/pcmcia/tcic.c                              |  2 +-
 drivers/pcmcia/yenta_socket.c                      |  2 +-
 drivers/pps/clients/pps-gpio.c                     |  4 ++--
 drivers/rtc/dev.c                                  |  2 +-
 drivers/rtc/rtc-test.c                             |  4 ++--
 drivers/s390/char/con3215.c                        |  4 ++--
 drivers/s390/char/sclp.c                           |  2 +-
 drivers/s390/char/sclp_vt220.c                     |  2 +-
 drivers/s390/char/tape_core.c                      |  2 +-
 drivers/s390/net/fsm.c                             |  4 ++--
 drivers/s390/scsi/zfcp_erp.c                       |  2 +-
 drivers/s390/scsi/zfcp_fsf.c                       |  4 ++--
 drivers/scsi/aic7xxx/aic79xx_core.c                |  2 +-
 drivers/scsi/aic94xx/aic94xx_hwi.c                 |  2 +-
 drivers/scsi/aic94xx/aic94xx_tmf.c                 |  2 +-
 drivers/scsi/arcmsr/arcmsr_hba.c                   |  4 ++--
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |  2 +-
 drivers/scsi/bnx2i/bnx2i_iscsi.c                   |  8 ++++----
 drivers/scsi/dc395x.c                              |  4 ++--
 drivers/scsi/esas2r/esas2r_main.c                  |  2 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c              |  2 +-
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c             |  2 +-
 drivers/scsi/ibmvscsi/ibmvfc.c                     |  4 ++--
 drivers/scsi/ibmvscsi/ibmvscsi.c                   |  2 +-
 drivers/scsi/ipr.c                                 |  8 ++++----
 drivers/scsi/libiscsi.c                            |  2 +-
 drivers/scsi/libsas/sas_expander.c                 |  2 +-
 drivers/scsi/libsas/sas_scsi_host.c                |  4 ++--
 drivers/scsi/megaraid/megaraid_mbox.c              |  2 +-
 drivers/scsi/megaraid/megaraid_mm.c                |  2 +-
 drivers/scsi/megaraid/megaraid_sas_base.c          |  2 +-
 drivers/scsi/mvsas/mv_sas.c                        |  2 +-
 drivers/scsi/ncr53c8xx.c                           |  2 +-
 drivers/scsi/pmcraid.c                             | 12 ++++++------
 drivers/scsi/qla2xxx/qla_edif.c                    |  2 +-
 drivers/scsi/qla2xxx/qla_iocb.c                    |  2 +-
 drivers/scsi/qla2xxx/qla_os.c                      |  2 +-
 drivers/scsi/qla4xxx/ql4_os.c                      |  2 +-
 drivers/scsi/smartpqi/smartpqi_init.c              |  2 +-
 drivers/scsi/sym53c8xx_2/sym_glue.c                |  2 +-
 drivers/tty/serial/fsl_lpuart.c                    |  2 +-
 drivers/tty/vcc.c                                  |  4 ++--
 drivers/usb/chipidea/otg_fsm.c                     |  2 +-
 drivers/usb/gadget/udc/snps_udc_core.c             | 14 +++++++-------
 drivers/usb/host/xhci.c                            |  2 +-
 drivers/usb/isp1760/isp1760-hcd.c                  |  4 ++--
 drivers/usb/phy/phy-fsl-usb.c                      |  2 +-
 drivers/usb/phy/phy-mv-usb.c                       |  2 +-
 drivers/watchdog/cpwd.c                            |  2 +-
 drivers/xen/grant-table.c                          |  4 ++--
 fs/jbd2/transaction.c                              |  2 +-
 fs/nilfs2/segment.c                                |  4 ++--
 include/linux/timer.h                              |  4 ++--
 include/linux/usb/otg-fsm.h                        |  6 +++---
 kernel/kthread.c                                   |  2 +-
 kernel/rcu/tasks.h                                 |  4 ++--
 kernel/time/sleep_timeout.c                        |  2 +-
 kernel/time/timer.c                                | 22 +++++++++++-----------
 mm/oom_kill.c                                      |  2 +-
 net/appletalk/aarp.c                               |  2 +-
 net/appletalk/ddp.c                                |  4 ++--
 net/atm/lec.c                                      |  6 +++---
 net/atm/mpc.c                                      |  2 +-
 net/ax25/af_ax25.c                                 |  2 +-
 net/core/drop_monitor.c                            |  4 ++--
 net/ipv4/igmp.c                                    |  2 +-
 net/lapb/lapb_timer.c                              |  4 ++--
 net/mptcp/pm.c                                     | 20 ++++++++++----------
 net/netfilter/ipset/ip_set_bitmap_gen.h            |  2 +-
 net/netfilter/ipset/ip_set_list_set.c              |  2 +-
 net/netfilter/nf_conntrack_expect.c                |  2 +-
 net/netfilter/nf_conntrack_netlink.c               |  2 +-
 net/netfilter/nfnetlink_log.c                      |  2 +-
 net/netrom/af_netrom.c                             |  2 +-
 net/rose/af_rose.c                                 |  2 +-
 net/rose/rose_link.c                               |  4 ++--
 net/sctp/sm_sideeffect.c                           |  2 +-
 net/x25/af_x25.c                                   |  2 +-
 samples/ftrace/sample-trace-array.c                |  2 +-
 sound/pci/asihpi/asihpi.c                          |  2 +-
 233 files changed, 400 insertions(+), 400 deletions(-)
Documentation/kernel-hacking/locking.rst +2 -2
index dff0646a717b..8a8e54f5beb0 100644
@@ -1003,7 +1003,7 @@ do::
 
 
 Another common problem is deleting timers which restart themselves (by
-calling add_timer() at the end of their timer function).
+calling timer_add() at the end of their timer function).
 Because this is a fairly common case which is prone to races, you should
 use timer_delete_sync() (``include/linux/timer.h``) to handle this case.
 
@@ -1338,7 +1338,7 @@ lock.
 
 -  kfree()
 
--  add_timer() and timer_delete()
+-  timer_add() and timer_delete()
 
 Mutex API reference
 ===================
Documentation/scsi/ChangeLog.lpfc +1 -1
index ccc48b8359bf..801895f3a284 100644
@@ -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 add_timer for fdmi in lpfc_ct.c.
+	* Use mod_timer 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.
Documentation/translations/it_IT/kernel-hacking/locking.rst +2 -2
index 4c21cf60f775..526da3e779de 100644
@@ -1024,7 +1024,7 @@ esecuzione, quindi possiamo fare come segue::
                     spin_unlock_bh(&list_lock);
 
 Un altro problema è l'eliminazione dei temporizzatori che si riavviano
-da soli (chiamando add_timer() alla fine della loro esecuzione).
+da soli (chiamando timer_add() alla fine della loro esecuzione).
 Dato che questo è un problema abbastanza comune con una propensione
 alle corse critiche, dovreste usare timer_delete_sync()
 (``include/linux/timer.h``) per gestire questo caso.
@@ -1377,7 +1377,7 @@ contesto, o trattenendo un qualsiasi *lock*.
 
 -  kfree()
 
--  add_timer() e timer_delete()
+-  timer_add() e timer_delete()
 
 Riferimento per l'API dei Mutex
 ===============================
arch/alpha/kernel/process.c +1 -1
index 582d96548385..e65c10820fb7 100644
@@ -381,7 +381,7 @@ __get_wchan(struct task_struct *p)
 	 * This one depends on the frame size of schedule().  Do a
 	 * "disass schedule" in gdb to find the frame size.  Also, the
 	 * code assumes that sleep_on() follows immediately after
-	 * interruptible_sleep_on() and that add_timer() follows
+	 * interruptible_sleep_on() and that timer_add() follows
 	 * immediately after interruptible_sleep().  Ugly, isn't it?
 	 * Maybe adding a wchan field to task_struct would be better,
 	 * after all...
arch/arm/mach-footbridge/dc21285.c +2 -2
index 6521ab3d24fa..de515121e3f0 100644
@@ -193,7 +193,7 @@ static irqreturn_t dc21285_serr_irq(int irq, void *dev_id)
 	 */
 	disable_irq(irq);
 	timer->expires = jiffies + HZ;
-	add_timer(timer);
+	timer_add(timer);
 
 	return IRQ_HANDLED;
 }
@@ -237,7 +237,7 @@ static irqreturn_t dc21285_parity_irq(int irq, void *dev_id)
 	 */
 	disable_irq(irq);
 	timer->expires = jiffies + HZ;
-	add_timer(timer);
+	timer_add(timer);
 
 	return IRQ_HANDLED;
 }
arch/m68k/amiga/amisound.c +1 -1
index 5fd93dfab809..2ba5a5df0272 100644
@@ -96,7 +96,7 @@ void amiga_mksound( unsigned int hz, unsigned int ticks )
 
 		if (ticks) {
 			sound_timer.expires = jiffies + ticks;
-			add_timer( &sound_timer );
+			timer_add( &sound_timer );
 		}
 
 		/* turn on DMA for audio channel 2 */
arch/m68k/mac/macboing.c +3 -3
index 6312d5b600a5..40e1e2c137a4 100644
@@ -201,7 +201,7 @@ void mac_mksound( unsigned int freq, unsigned int length )
 	mac_asc_regs[ ASC_ENABLE ] = ASC_ENABLE_SAMPLE;
 
 	mac_sound_timer.expires = jiffies + length;
-	add_timer( &mac_sound_timer );
+	timer_add( &mac_sound_timer );
 
 	local_irq_restore(flags);
 }
@@ -253,7 +253,7 @@ static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsig
 
 	mac_sound_timer.function = mac_quadra_ring_bell;
 	mac_sound_timer.expires = jiffies + 1;
-	add_timer( &mac_sound_timer );
+	timer_add( &mac_sound_timer );
 
 	local_irq_restore(flags);
 }
@@ -287,7 +287,7 @@ static void mac_quadra_ring_bell(struct timer_list *unused)
 			mac_asc_regs[ 0 ] = mac_asc_wave_tab[ mac_bell_phase & ( sizeof( mac_asc_wave_tab ) - 1 ) ];
 		}
 		mac_sound_timer.expires = jiffies + 1;
-		add_timer( &mac_sound_timer );
+		timer_add( &mac_sound_timer );
 	}
 	else
 		mac_asc_regs[ 0x801 ] = 0;
arch/mips/sgi-ip22/ip22-reset.c +3 -3
index 8539f562f5b8..32b0f9f1d877 100644
@@ -102,7 +102,7 @@ static void debounce(struct timer_list *unused)
 	if (sgint->istat1 & SGINT_ISTAT1_PWR) {
 		/* Interrupt still being sent. */
 		debounce_timer.expires = jiffies + (HZ / 20); /* 0.05s	*/
-		add_timer(&debounce_timer);
+		timer_add(&debounce_timer);
 
 		sgioc->panel = SGIOC_PANEL_POWERON | SGIOC_PANEL_POWERINTR |
 			       SGIOC_PANEL_VOLDNINTR | SGIOC_PANEL_VOLDNHOLD |
@@ -134,7 +134,7 @@ static inline void power_button(void)
 
 	timer_setup(&power_timer, power_timeout, 0);
 	power_timer.expires = jiffies + POWERDOWN_TIMEOUT * HZ;
-	add_timer(&power_timer);
+	timer_add(&power_timer);
 }
 
 static irqreturn_t panel_int(int irq, void *dev_id)
@@ -149,7 +149,7 @@ static irqreturn_t panel_int(int irq, void *dev_id)
 		disable_irq_nosync(SGI_PANEL_IRQ);
 		timer_setup(&debounce_timer, debounce, 0);
 		debounce_timer.expires = jiffies + 5;
-		add_timer(&debounce_timer);
+		timer_add(&debounce_timer);
 	}
 
 	/* Power button was pressed
arch/mips/sgi-ip32/ip32-reset.c +1 -1
index 6bdc1421cda4..ef778499ebd3 100644
@@ -108,7 +108,7 @@ void ip32_prepare_poweroff(void)
 
 	timer_setup(&power_timer, power_timeout, 0);
 	power_timer.expires = jiffies + POWERDOWN_TIMEOUT * HZ;
-	add_timer(&power_timer);
+	timer_add(&power_timer);
 }
 
 static int panic_event(struct notifier_block *this, unsigned long event,
arch/powerpc/mm/book3s64/hash_utils.c +1 -1
index 5158aefe4873..87b080bbd57c 100644
@@ -1328,7 +1328,7 @@ static void __init htab_initialize(void)
 
 		timer_setup(&stress_hpt_timer, stress_hpt_timer_fn, 0);
 		stress_hpt_timer.expires = jiffies + msecs_to_jiffies(10);
-		add_timer(&stress_hpt_timer);
+		timer_add(&stress_hpt_timer);
 	}
 
 	/*
arch/powerpc/platforms/powermac/low_i2c.c +3 -3
index 4fda05aa83ba..29637125c652 100644
@@ -351,7 +351,7 @@ static irqreturn_t kw_i2c_irq(int irq, void *dev_id)
 	kw_i2c_handle_interrupt(host, kw_read_reg(reg_isr));
 	if (host->state != state_idle) {
 		host->timeout_timer.expires = jiffies + KW_POLL_TIMEOUT;
-		add_timer(&host->timeout_timer);
+		timer_add(&host->timeout_timer);
 	}
 	spin_unlock_irqrestore(&host->lock, flags);
 	return IRQ_HANDLED;
@@ -374,7 +374,7 @@ static void kw_i2c_timeout(struct timer_list *t)
 	kw_i2c_handle_interrupt(host, kw_read_reg(reg_isr));
 	if (host->state != state_idle) {
 		host->timeout_timer.expires = jiffies + KW_POLL_TIMEOUT;
-		add_timer(&host->timeout_timer);
+		timer_add(&host->timeout_timer);
 	}
  skip:
 	spin_unlock_irqrestore(&host->lock, flags);
@@ -454,7 +454,7 @@ static int kw_i2c_xfer(struct pmac_i2c_bus *bus, u8 addrdir, int subsize,
 		kw_write_reg(reg_isr, kw_read_reg(reg_isr));
 		/* Arm timeout */
 		host->timeout_timer.expires = jiffies + KW_POLL_TIMEOUT;
-		add_timer(&host->timeout_timer);
+		timer_add(&host->timeout_timer);
 		/* Enable emission */
 		kw_write_reg(reg_ier, KW_I2C_IRQ_MASK);
 	}
arch/sh/drivers/pci/common.c +1 -1
index 9633b6147a05..5f94c9c0e713 100644
@@ -152,7 +152,7 @@ unsigned int pcibios_handle_status_errors(unsigned long addr,
 		if (hose->err_irq) {
 			disable_irq_nosync(hose->err_irq);
 			hose->err_timer.expires = jiffies + HZ;
-			add_timer(&hose->err_timer);
+			timer_add(&hose->err_timer);
 		}
 	}
 
arch/sh/drivers/pci/pci-sh7780.c +1 -1
index 9a624a6ee354..40838315c6f4 100644
@@ -156,7 +156,7 @@ static irqreturn_t sh7780_pci_serr_irq(int irq, void *dev_id)
 	/* Back off the IRQ for awhile */
 	disable_irq_nosync(irq);
 	hose->serr_timer.expires = jiffies + HZ;
-	add_timer(&hose->serr_timer);
+	timer_add(&hose->serr_timer);
 
 	return IRQ_HANDLED;
 }
arch/sparc/kernel/led.c +1 -1
index f4fb82b019bb..fb2974f70f84 100644
@@ -47,7 +47,7 @@ static void led_blink(struct timer_list *unused)
 	} else { /* blink at user specified interval */
 		led_blink_timer.expires = jiffies + (timeout * HZ);
 	}
-	add_timer(&led_blink_timer);
+	timer_add(&led_blink_timer);
 }
 
 #ifdef CONFIG_PROC_FS
arch/um/drivers/vector_kern.c +1 -1
index 570a14f9f995..abaf9fdb8ab2 100644
@@ -1302,7 +1302,7 @@ static int vector_net_open(struct net_device *dev)
 	vdevice->opened = 1;
 
 	if ((vp->options & VECTOR_TX) != 0)
-		add_timer(&vp->tl);
+		timer_add(&vp->tl);
 	return 0;
 out_close:
 	vector_net_close(dev);
arch/x86/kernel/tsc_sync.c +1 -1
index 4334033658ed..982a407fb1fb 100644
@@ -113,7 +113,7 @@ static int __init start_sync_check_timer(void)
 
 	timer_setup(&tsc_sync_check_timer, tsc_sync_check_timer_fn, 0);
 	tsc_sync_check_timer.expires = jiffies + SYNC_CHECK_INTERVAL;
-	add_timer(&tsc_sync_check_timer);
+	timer_add(&tsc_sync_check_timer);
 
 	return 0;
 }
block/blk-iocost.c +1 -1
index 5bfd70311359..a1ec4946b928 100644
@@ -1073,7 +1073,7 @@ static void ioc_start_period(struct ioc *ioc, struct ioc_now *now)
 	write_seqcount_end(&ioc->period_seqcount);
 
 	ioc->timer.expires = jiffies + usecs_to_jiffies(ioc->period_us);
-	add_timer(&ioc->timer);
+	timer_add(&ioc->timer);
 }
 
 /*
drivers/accel/qaic/qaic_timesync.c +1 -1
index 3fac540f8e03..1b59c51ea44a 100644
@@ -204,7 +204,7 @@ static int qaic_timesync_probe(struct mhi_device *mhi_dev, const struct mhi_devi
 	mqtsdev->qtimer_addr = qdev->bar_mhi + QTIMER_REG_OFFSET;
 	timer_setup(timer, qaic_timesync_timer, 0);
 	timer->expires = jiffies + msecs_to_jiffies(timesync_delay_ms);
-	add_timer(timer);
+	timer_add(timer);
 	dev_set_drvdata(&mhi_dev->dev, mqtsdev);
 
 	return 0;
drivers/acpi/apei/ghes.c +1 -1
index f5e6400bfbfb..9a8ace68dc2b 100644
@@ -1133,7 +1133,7 @@ static void ghes_add_timer(struct ghes *ghes)
 	}
 	expire = jiffies + msecs_to_jiffies(g->notify.poll_interval);
 	ghes->timer.expires = round_jiffies_relative(expire);
-	add_timer(&ghes->timer);
+	timer_add(&ghes->timer);
 }
 
 static void ghes_poll_func(struct timer_list *t)
drivers/ata/libata-eh.c +2 -2
index 883d33db7972..141057623914 100644
@@ -890,7 +890,7 @@ void ata_eh_fastdrain_timerfn(struct timer_list *t)
 		ap->fastdrain_cnt = cnt;
 		ap->fastdrain_timer.expires =
 			ata_deadline(jiffies, ATA_EH_FASTDRAIN_INTERVAL);
-		add_timer(&ap->fastdrain_timer);
+		timer_add(&ap->fastdrain_timer);
 	}
 
  out_unlock:
@@ -931,7 +931,7 @@ static void ata_eh_set_pending(struct ata_port *ap, int fastdrain)
 	ap->fastdrain_cnt = cnt;
 	ap->fastdrain_timer.expires =
 		ata_deadline(jiffies, ATA_EH_FASTDRAIN_INTERVAL);
-	add_timer(&ap->fastdrain_timer);
+	timer_add(&ap->fastdrain_timer);
 }
 
 /**
drivers/atm/idt77105.c +2 -2
index e6a300203e6c..2dd628debe11 100644
@@ -308,10 +308,10 @@ static int idt77105_start(struct atm_dev *dev)
 		start_timer = 0;
                 
 		stats_timer.expires = jiffies+IDT77105_STATS_TIMER_PERIOD;
-		add_timer(&stats_timer);
+		timer_add(&stats_timer);
                 
 		restart_timer.expires = jiffies+IDT77105_RESTART_TIMER_PERIOD;
-		add_timer(&restart_timer);
+		timer_add(&restart_timer);
 	}
 	spin_unlock_irqrestore(&idt77105_priv_lock, flags);
 	return 0;
drivers/atm/idt77252.c +1 -1
index 1206ab764ba9..c7c0cd9ca86a 100644
@@ -2102,7 +2102,7 @@ idt77252_est_timer(struct timer_list *t)
 	}
 
 	est->timer.expires = jiffies + ((HZ / 4) << est->interval);
-	add_timer(&est->timer);
+	timer_add(&est->timer);
 
 out:
 	spin_unlock_irqrestore(&vc->lock, flags);
drivers/atm/iphase.c +2 -2
index 301e697e22ad..246ec28aca4f 100644
@@ -2737,7 +2737,7 @@ static int ia_open(struct atm_vcc *vcc)
            static u8 first = 1; 
            if (first) {
               ia_timer.expires = jiffies + 3*HZ;
-              add_timer(&ia_timer);
+              timer_add(&ia_timer);
               first = 0;
            }           
         }
@@ -3273,7 +3273,7 @@ static int __init ia_module_init(void)
 	ret = pci_register_driver(&ia_driver);
 	if (ret >= 0) {
 		ia_timer.expires = jiffies + 3*HZ;
-		add_timer(&ia_timer); 
+		timer_add(&ia_timer); 
 	} else
 		printk(KERN_ERR DEV_LABEL ": no adapter found\n");  
 	return ret;
drivers/atm/lanai.c +1 -1
index 2a1fe3080712..d8ac6fade09a 100644
@@ -1787,7 +1787,7 @@ static inline void lanai_timed_poll_start(struct lanai_dev *lanai)
 {
 	timer_setup(&lanai->timer, lanai_timed_poll, 0);
 	lanai->timer.expires = jiffies + LANAI_POLL_PERIOD;
-	add_timer(&lanai->timer);
+	timer_add(&lanai->timer);
 }
 
 static inline void lanai_timed_poll_stop(struct lanai_dev *lanai)
drivers/atm/nicstar.c +1 -1
index 45952cfea06b..028bb868180b 100644
@@ -290,7 +290,7 @@ static int __init nicstar_init(void)
 	if (!error) {
 		timer_setup(&ns_timer, ns_poll, 0);
 		ns_timer.expires = jiffies + NS_POLL_PERIOD;
-		add_timer(&ns_timer);
+		timer_add(&ns_timer);
 	}
 
 	return error;
drivers/atm/suni.c +1 -1
index 7d0fa729c2fe..899bab8b3c43 100644
@@ -331,7 +331,7 @@ static int suni_start(struct atm_dev *dev)
 printk(KERN_DEBUG "[u] p=0x%lx,n=0x%lx\n",(unsigned long) poll_timer.list.prev,
     (unsigned long) poll_timer.list.next);
 #endif
-		add_timer(&poll_timer);
+		timer_add(&poll_timer);
 	}
 	return 0;
 }
drivers/auxdisplay/panel.c +1 -1
index 958c0e31e84a..ccfd0b06ed6c 100644
@@ -1360,7 +1360,7 @@ static void init_scan_timer(void)
 
 	timer_setup(&scan_timer, panel_scan_timer, 0);
 	scan_timer.expires = jiffies + INPUT_POLL_TIME;
-	add_timer(&scan_timer);
+	timer_add(&scan_timer);
 }
 
 /* converts a name of the form "({BbAaPpSsEe}{01234567-})*" to a series of bits.
drivers/base/power/main.c +1 -1
index 318d4a4efbea..c47b246dbf87 100644
@@ -548,7 +548,7 @@ static void dpm_watchdog_set(struct dpm_watchdog *wd, struct device *dev)
 	timer_setup_on_stack(timer, dpm_watchdog_handler, 0);
 	/* use same timeout value for both suspend and resume */
 	timer->expires = jiffies + HZ * CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT;
-	add_timer(timer);
+	timer_add(timer);
 }
 
 /**
drivers/block/amiflop.c +4 -4
index 6357d86eafdc..5e7060874912 100644
@@ -449,7 +449,7 @@ static void motor_on_callback(struct timer_list *unused)
 		complete_all(&motor_on_completion);
 	} else {
 		motor_on_timer.expires = jiffies + HZ/10;
-		add_timer(&motor_on_timer);
+		timer_add(&motor_on_timer);
 	}
 }
 
@@ -495,7 +495,7 @@ static void fd_motor_off(struct timer_list *timer)
 	if (!try_fdc(drive)) {
 		/* We would be blocked in an interrupt, so try again later */
 		timer->expires = jiffies + 1;
-		add_timer(timer);
+		timer_add(timer);
 		return;
 	}
 	unit[drive].motor = 0;
@@ -680,7 +680,7 @@ static irqreturn_t fd_block_done(int irq, void *dummy)
 		writepending = 2;
 		post_write_timer.expires = jiffies + 1; /* at least 2 ms */
 		post_write_timer_drive = selected;
-		add_timer(&post_write_timer);
+		timer_add(&post_write_timer);
 	}
 	else {                /* reading */
 		block_flag = 0;
@@ -1374,7 +1374,7 @@ static void flush_track_callback(struct timer_list *timer)
 	if (!try_fdc(nr)) {
 		/* we might block in an interrupt, so try again later */
 		flush_track_timer[nr].expires = jiffies + 1;
-		add_timer(flush_track_timer + nr);
+		timer_add(flush_track_timer + nr);
 		return;
 	}
 	get_fdc(nr);
drivers/block/aoe/aoecmd.c +1 -1
index 50cc90f6ab35..01bba6a7d2ea 100644
@@ -824,7 +824,7 @@ rexmit_timer(struct timer_list *timer)
 	}
 
 	d->timer.expires = jiffies + TIMERTICK;
-	add_timer(&d->timer);
+	timer_add(&d->timer);
 
 	spin_unlock_irqrestore(&d->lock, flags);
 }
drivers/block/aoe/aoedev.c +2 -2
index bba05f0c5bbd..4cbffbfb06e6 100644
@@ -153,7 +153,7 @@ dummy_timer(struct timer_list *t)
 	if (d->flags & DEVFL_TKILL)
 		return;
 	d->timer.expires = jiffies + HZ;
-	add_timer(&d->timer);
+	timer_add(&d->timer);
 }
 
 static void
@@ -476,7 +476,7 @@ aoedev_by_aoeaddr(ulong maj, int min, int do_alloc)
 	skb_queue_head_init(&d->skbpool);
 	timer_setup(&d->timer, dummy_timer, 0);
 	d->timer.expires = jiffies + HZ;
-	add_timer(&d->timer);
+	timer_add(&d->timer);
 	d->bufpool = NULL;	/* defer to aoeblk_gdalloc */
 	d->tgt = d->targets;
 	d->ref = 1;
drivers/block/drbd/drbd_receiver.c +1 -1
index e5a2e5f7887b..fbda55ba253e 100644
@@ -5841,7 +5841,7 @@ static int got_BarrierAck(struct drbd_connection *connection, struct packet_info
 		    atomic_read(&device->ap_in_flight) == 0 &&
 		    !test_and_set_bit(AHEAD_TO_SYNC_SOURCE, &device->flags)) {
 			device->start_resync_timer.expires = jiffies + HZ;
-			add_timer(&device->start_resync_timer);
+			timer_add(&device->start_resync_timer);
 		}
 	}
 	rcu_read_unlock();
drivers/block/drbd/drbd_worker.c +2 -2
index 50ee616c6c5d..1d61328582e2 100644
@@ -1707,7 +1707,7 @@ static void do_start_resync(struct drbd_device *device)
 	if (atomic_read(&device->unacked_cnt) || atomic_read(&device->rs_pending_cnt)) {
 		drbd_warn(device, "postponing start_resync ...\n");
 		device->start_resync_timer.expires = jiffies + HZ/10;
-		add_timer(&device->start_resync_timer);
+		timer_add(&device->start_resync_timer);
 		return;
 	}
 
@@ -1789,7 +1789,7 @@ void drbd_start_resync(struct drbd_device *device, enum drbd_conns side)
 		if (!mutex_trylock(device->state_mutex)) {
 			set_bit(B_RS_H_DONE, &device->flags);
 			device->start_resync_timer.expires = jiffies + HZ/5;
-			add_timer(&device->start_resync_timer);
+			timer_add(&device->start_resync_timer);
 			return;
 		}
 	} else {
drivers/block/floppy.c +1 -1
index e97432032f01..a185aca5f34e 100644
@@ -948,7 +948,7 @@ static void floppy_off(unsigned int drive)
 		motor_off_timer[drive].expires =
 		    jiffies + drive_params[drive].spindown - delta;
 	}
-	add_timer(motor_off_timer + drive);
+	timer_add(motor_off_timer + drive);
 }
 
 /*
drivers/block/swim3.c +1 -1
index 01f7aef3fcfb..5b4b6f5bde09 100644
@@ -365,7 +365,7 @@ static void set_timeout(struct floppy_state *fs, int nticks,
 		timer_delete(&fs->timeout);
 	fs->timeout.expires = jiffies + nticks;
 	fs->timeout.function = proc;
-	add_timer(&fs->timeout);
+	timer_add(&fs->timeout);
 	fs->timeout_pending = 1;
 }
 
drivers/char/hw_random/xgene-rng.c +1 -1
index 709a36507145..00b74d07c3db 100644
@@ -100,7 +100,7 @@ static void xgene_rng_expired_timer(struct timer_list *t)
 static void xgene_rng_start_timer(struct xgene_rng_dev *ctx)
 {
 	ctx->failure_timer.expires = jiffies + 120 * HZ;
-	add_timer(&ctx->failure_timer);
+	timer_add(&ctx->failure_timer);
 }
 
 /*
drivers/char/ipmi/bt-bmc.c +2 -2
index a179d4797011..4f1b2a3eeb54 100644
@@ -351,7 +351,7 @@ static void poll_timer(struct timer_list *t)
 
 	bt_bmc->poll_timer.expires += msecs_to_jiffies(500);
 	wake_up(&bt_bmc->queue);
-	add_timer(&bt_bmc->poll_timer);
+	timer_add(&bt_bmc->poll_timer);
 }
 
 static irqreturn_t bt_bmc_irq(int irq, void *arg)
@@ -444,7 +444,7 @@ static int bt_bmc_probe(struct platform_device *pdev)
 		dev_info(dev, "No IRQ; using timer\n");
 		timer_setup(&bt_bmc->poll_timer, poll_timer, 0);
 		bt_bmc->poll_timer.expires = jiffies + msecs_to_jiffies(10);
-		add_timer(&bt_bmc->poll_timer);
+		timer_add(&bt_bmc->poll_timer);
 	}
 
 	writel((BT_IO_BASE << BT_CR0_IO_BASE) |
drivers/comedi/drivers/comedi_test.c +2 -2
index 71124b694bf3..b15cb3d62e26 100644
@@ -403,7 +403,7 @@ static int waveform_ai_cmd(struct comedi_device *dev,
 	devpriv->ai_timer_enable = true;
 	devpriv->ai_timer.expires =
 		jiffies + usecs_to_jiffies(devpriv->ai_convert_period) + 1;
-	add_timer(&devpriv->ai_timer);
+	timer_add(&devpriv->ai_timer);
 	spin_unlock_bh(&dev->spinlock);
 	return 0;
 }
@@ -537,7 +537,7 @@ static int waveform_ao_inttrig_start(struct comedi_device *dev,
 	devpriv->ao_timer_enable = true;
 	devpriv->ao_timer.expires =
 		jiffies + usecs_to_jiffies(devpriv->ao_scan_period);
-	add_timer(&devpriv->ao_timer);
+	timer_add(&devpriv->ao_timer);
 	spin_unlock_bh(&dev->spinlock);
 
 	return 1;
drivers/comedi/drivers/das16.c +1 -1
index a2588b35e156..5e0866d5d1d6 100644
@@ -739,7 +739,7 @@ static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s)
 	spin_lock_irqsave(&dev->spinlock, flags);
 	devpriv->timer_running = 1;
 	devpriv->timer.expires = jiffies + timer_period();
-	add_timer(&devpriv->timer);
+	timer_add(&devpriv->timer);
 
 	/* enable DMA interrupt with external or internal pacing */
 	devpriv->ctrl_reg &= ~(DAS16_CTRL_INTE | DAS16_CTRL_PACING_MASK);
drivers/comedi/drivers/jr3_pci.c +2 -2
index 18a23d6625f6..827e8e2034e4 100644
@@ -599,7 +599,7 @@ static void jr3_pci_poll_dev(struct timer_list *t)
 	spin_unlock_irqrestore(&dev->spinlock, flags);
 
 	devpriv->timer.expires = jiffies + msecs_to_jiffies(delay);
-	add_timer(&devpriv->timer);
+	timer_add(&devpriv->timer);
 }
 
 static struct jr3_pci_subdev_private *
@@ -748,7 +748,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
 	devpriv->dev = dev;
 	timer_setup(&devpriv->timer, jr3_pci_poll_dev, 0);
 	devpriv->timer.expires = jiffies + msecs_to_jiffies(1000);
-	add_timer(&devpriv->timer);
+	timer_add(&devpriv->timer);
 
 	return 0;
 }
drivers/gpu/drm/xe/xe_execlist.c +2 -2
index 788f56b066b6..4ded38304a52 100644
@@ -251,7 +251,7 @@ static void xe_execlist_port_irq_fail_timer(struct timer_list *timer)
 	spin_unlock_irq(&port->lock);
 
 	port->irq_fail.expires = jiffies + msecs_to_jiffies(1000);
-	add_timer(&port->irq_fail);
+	timer_add(&port->irq_fail);
 }
 
 struct xe_execlist_port *xe_execlist_port_create(struct xe_device *xe,
@@ -287,7 +287,7 @@ struct xe_execlist_port *xe_execlist_port_create(struct xe_device *xe,
 	/* TODO: Fix the interrupt code so it doesn't race like mad */
 	timer_setup(&port->irq_fail, xe_execlist_port_irq_fail_timer, 0);
 	port->irq_fail.expires = jiffies + msecs_to_jiffies(1000);
-	add_timer(&port->irq_fail);
+	timer_add(&port->irq_fail);
 
 	return port;
 
drivers/greybus/operation.c +1 -1
index 6d02ab77e32d..04e7d5408ce1 100644
@@ -771,7 +771,7 @@ int gb_operation_request_send(struct gb_operation *operation,
 
 	if (timeout) {
 		operation->timer.expires = jiffies + msecs_to_jiffies(timeout);
-		add_timer(&operation->timer);
+		timer_add(&operation->timer);
 	}
 
 	return 0;
drivers/hwmon/npcm750-pwm-fan.c +2 -2
index 802c73def428..227dd14fd5c4 100644
@@ -361,7 +361,7 @@ static void npcm7xx_fan_polling(struct timer_list *t)
 	/* reset the timer interval */
 	data->fan_timer.expires = jiffies +
 		msecs_to_jiffies(NPCM7XX_FAN_POLL_TIMER_200MS);
-	add_timer(&data->fan_timer);
+	timer_add(&data->fan_timer);
 }
 
 static inline void npcm7xx_fan_compute(struct npcm7xx_pwm_fan_data *data,
@@ -1027,7 +1027,7 @@ static int npcm7xx_pwm_fan_probe(struct platform_device *pdev)
 				msecs_to_jiffies(NPCM7XX_FAN_POLL_TIMER_200MS);
 			timer_setup(&data->fan_timer,
 				    npcm7xx_fan_polling, 0);
-			add_timer(&data->fan_timer);
+			timer_add(&data->fan_timer);
 			break;
 		}
 	}
drivers/infiniband/hw/cxgb4/cm.c +1 -1
index b3b45c49077d..8d7ee865886b 100644
@@ -185,7 +185,7 @@ static void start_ep_timer(struct c4iw_ep *ep)
 	clear_bit(TIMEOUT, &ep->com.flags);
 	c4iw_get_ep(&ep->com);
 	ep->timer.expires = jiffies + ep_timeout_secs * HZ;
-	add_timer(&ep->timer);
+	timer_add(&ep->timer);
 }
 
 static int stop_ep_timer(struct c4iw_ep *ep)
drivers/infiniband/hw/hfi1/chip.c +1 -1
index 0781ab756d44..a5eb009a0db7 100644
@@ -12605,7 +12605,7 @@ static int init_cntrs(struct hfi1_devdata *dd)
 	const int bit_type_32_sz = strlen(bit_type_32);
 	u32 sdma_engines = chip_sdma_engines(dd);
 
-	/* set up the stats timer; the add_timer is done at the end */
+	/* set up the stats timer; the timer_add is done at the end */
 	timer_setup(&dd->synth_stats_timer, update_synth_timer, 0);
 
 	/***********************/
drivers/infiniband/hw/hfi1/driver.c +1 -1
index 96bffa9e8dc7..2d12278ec96a 100644
@@ -1361,7 +1361,7 @@ void hfi1_start_led_override(struct hfi1_pportdata *ppd, unsigned int timeon,
 	if (!timer_pending(&ppd->led_override_timer)) {
 		timer_setup(&ppd->led_override_timer, run_led_override, 0);
 		ppd->led_override_timer.expires = jiffies + 1;
-		add_timer(&ppd->led_override_timer);
+		timer_add(&ppd->led_override_timer);
 		atomic_set(&ppd->led_override_timer_active, 1);
 		/* Ensure the atomic_set is visible to all CPUs */
 		smp_wmb();
drivers/infiniband/hw/hfi1/tid_rdma.c +2 -2
index 948b5883e9dd..73a600aea617 100644
@@ -3944,7 +3944,7 @@ static void hfi1_add_tid_reap_timer(struct rvt_qp *qp)
 		qpriv->s_flags |= HFI1_R_TID_RSC_TIMER;
 		qpriv->s_tid_timer.expires = jiffies +
 			qpriv->tid_timer_timeout_jiffies;
-		add_timer(&qpriv->s_tid_timer);
+		timer_add(&qpriv->s_tid_timer);
 	}
 }
 
@@ -4758,7 +4758,7 @@ void hfi1_add_tid_retry_timer(struct rvt_qp *qp)
 		priv->s_flags |= HFI1_S_TID_RETRY_TIMER;
 		priv->s_tid_retry_timer.expires = jiffies +
 			priv->tid_retry_timeout_jiffies + rdi->busy_jiffies;
-		add_timer(&priv->s_tid_retry_timer);
+		timer_add(&priv->s_tid_retry_timer);
 	}
 }
 
drivers/infiniband/hw/irdma/cm.c +2 -2
index 2a6d705bd471..12ae5571047e 100644
@@ -1183,7 +1183,7 @@ int irdma_schedule_cm_timer(struct irdma_cm_node *cm_node,
 
 	if (!was_timer_set) {
 		cm_core->tcp_timer.expires = new_send->timetosend;
-		add_timer(&cm_core->tcp_timer);
+		timer_add(&cm_core->tcp_timer);
 	}
 	spin_unlock_irqrestore(&cm_core->ht_lock, flags);
 
@@ -1366,7 +1366,7 @@ static void irdma_cm_timer_tick(struct timer_list *t)
 		spin_lock_irqsave(&cm_core->ht_lock, flags);
 		if (!timer_pending(&cm_core->tcp_timer)) {
 			cm_core->tcp_timer.expires = nexttimeout;
-			add_timer(&cm_core->tcp_timer);
+			timer_add(&cm_core->tcp_timer);
 		}
 		spin_unlock_irqrestore(&cm_core->ht_lock, flags);
 	}
drivers/infiniband/hw/irdma/utils.c +1 -1
index b510ef747399..32e775e07afb 100644
@@ -950,7 +950,7 @@ void irdma_terminate_start_timer(struct irdma_sc_qp *qp)
 	timer_setup(&iwqp->terminate_timer, irdma_terminate_timeout, 0);
 	iwqp->terminate_timer.expires = jiffies + HZ;
 
-	add_timer(&iwqp->terminate_timer);
+	timer_add(&iwqp->terminate_timer);
 }
 
 /**
drivers/infiniband/hw/mthca/mthca_catas.c +1 -1
index f1d79968c985..4331aa00c6a7 100644
@@ -166,7 +166,7 @@ void mthca_start_catas_poll(struct mthca_dev *dev)
 
 	dev->catas_err.timer.expires  = jiffies + MTHCA_CATAS_POLL_INTERVAL;
 	INIT_LIST_HEAD(&dev->catas_err.list);
-	add_timer(&dev->catas_err.timer);
+	timer_add(&dev->catas_err.timer);
 }
 
 void mthca_stop_catas_poll(struct mthca_dev *dev)
drivers/infiniband/hw/qib/qib_driver.c +1 -1
index 9c478ab9238b..c3cdf14d32e0 100644
@@ -713,7 +713,7 @@ void qib_set_led_override(struct qib_pportdata *ppd, unsigned int val)
 		/* Need to start timer */
 		timer_setup(&ppd->led_override_timer, qib_run_led_override, 0);
 		ppd->led_override_timer.expires = jiffies + 1;
-		add_timer(&ppd->led_override_timer);
+		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);
drivers/infiniband/hw/qib/qib_iba6120.c +2 -2
index 2640d283eee6..bb9d089fac7a 100644
@@ -2611,7 +2611,7 @@ static void qib_chk_6120_errormask(struct qib_devdata *dd)
  *
  * This needs more work; in particular, decision on whether we really
  * need traffic_wds done the way it is
- * called from add_timer
+ * called from timer_add
  */
 static void qib_get_6120_faststats(struct timer_list *t)
 {
@@ -3240,7 +3240,7 @@ static int init_6120_variables(struct qib_devdata *dd)
 	 */
 	dd->rhdrhead_intr_off = 1ULL << 32;
 
-	/* setup the stats timer; the add_timer is done at end of init */
+	/* setup the stats timer; the timer_add is done at end of init */
 	timer_setup(&dd->stats_timer, qib_get_6120_faststats, 0);
 	timer_setup(&dd->cspec->pma_timer, pma_6120_timer, 0);
 
drivers/infiniband/hw/qib/qib_iba7220.c +3 -3
index 0b7399d3f46e..2731185dad97 100644
@@ -1080,7 +1080,7 @@ static void handle_7220_chase(struct qib_pportdata *ppd, u64 ibcst)
 				QLOGIC_IB_IBCC_LINKINITCMD_DISABLE);
 			ppd->cpspec->chase_timer.expires = jiffies +
 				QIB_CHASE_DIS_TIME;
-			add_timer(&ppd->cpspec->chase_timer);
+			timer_add(&ppd->cpspec->chase_timer);
 		} else if (!ppd->cpspec->chase_end)
 			ppd->cpspec->chase_end = tnow + QIB_CHASE_TIME;
 		break;
@@ -3236,7 +3236,7 @@ static u32 qib_read_7220portcntrs(struct qib_devdata *dd, loff_t pos, u32 port,
  *
  * This needs more work; in particular, decision on whether we really
  * need traffic_wds done the way it is
- * called from add_timer
+ * called from timer_add
  */
 static void qib_get_7220_faststats(struct timer_list *t)
 {
@@ -4051,7 +4051,7 @@ static int qib_init_7220_variables(struct qib_devdata *dd)
 	 */
 	dd->rhdrhead_intr_off = 1ULL << 32;
 
-	/* setup the stats timer; the add_timer is done at end of init */
+	/* setup the stats timer; the timer_add is done at end of init */
 	timer_setup(&dd->stats_timer, qib_get_7220_faststats, 0);
 	dd->stats_timer.expires = jiffies + ACTIVITY_TIMER * HZ;
 
drivers/infiniband/hw/qib/qib_iba7322.c +3 -3
index 71258d17dbe8..f5beacbd2c46 100644
@@ -1740,7 +1740,7 @@ static void disable_chase(struct qib_pportdata *ppd, unsigned long tnow,
 	qib_set_ib_7322_lstate(ppd, QLOGIC_IB_IBCC_LINKCMD_DOWN,
 		QLOGIC_IB_IBCC_LINKINITCMD_DISABLE);
 	ppd->cpspec->chase_timer.expires = jiffies + QIB_CHASE_DIS_TIME;
-	add_timer(&ppd->cpspec->chase_timer);
+	timer_add(&ppd->cpspec->chase_timer);
 }
 
 static void handle_serdes_issues(struct qib_pportdata *ppd, u64 ibcst)
@@ -5080,7 +5080,7 @@ static u32 qib_read_7322portcntrs(struct qib_devdata *dd, loff_t pos, u32 port,
  * "active time", which in turn is only logged into the eeprom,
  * which we don;t have, yet, for 7322-based boards.
  *
- * called from add_timer
+ * called from timer_add
  */
 static void qib_get_7322_faststats(struct timer_list *t)
 {
@@ -6574,7 +6574,7 @@ static int qib_init_7322_variables(struct qib_devdata *dd)
 	dd->rhdrhead_intr_off =
 		(u64) rcv_int_count << IBA7322_HDRHEAD_PKTINT_SHIFT;
 
-	/* setup the stats timer; the add_timer is done at end of init */
+	/* setup the stats timer; the timer_add is done at end of init */
 	timer_setup(&dd->stats_timer, qib_get_7322_faststats, 0);
 
 	dd->ureg_align = 0x10000;  /* 64KB alignment */
drivers/infiniband/hw/qib/qib_mad.c +1 -1
index b4b39c6ee134..a8d909afa4e6 100644
@@ -2431,7 +2431,7 @@ void qib_notify_create_mad_agent(struct rvt_dev_info *rdi, int port_idx)
 	timer_setup(&dd->pport[port_idx].cong_stats.timer,
 		    xmit_wait_timer_func, 0);
 	dd->pport[port_idx].cong_stats.timer.expires = 0;
-	add_timer(&dd->pport[port_idx].cong_stats.timer);
+	timer_add(&dd->pport[port_idx].cong_stats.timer);
 }
 
 void qib_notify_free_mad_agent(struct rvt_dev_info *rdi, int port_idx)
drivers/infiniband/hw/qib/qib_sd7220.c +1 -1
index 40bc0a34273e..58cccc6c94e6 100644
@@ -1436,7 +1436,7 @@ void set_7220_relock_poll(struct qib_devdata *dd, int ibup)
 			timer_setup(&cs->relock_timer, qib_run_relock, 0);
 			cs->relock_interval = timeout;
 			cs->relock_timer.expires = jiffies + timeout;
-			add_timer(&cs->relock_timer);
+			timer_add(&cs->relock_timer);
 		} else {
 			cs->relock_interval = timeout;
 			mod_timer(&cs->relock_timer, jiffies + timeout);
drivers/infiniband/hw/qib/qib_tx.c +1 -1
index 397928c80f7c..bac1bd975fb0 100644
@@ -522,7 +522,7 @@ 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 add_timer.
+ * Timer may already be running, so use mod_timer, not timer_add.
  */
 void qib_hol_init(struct qib_pportdata *ppd)
 {
drivers/infiniband/sw/rdmavt/qp.c +1 -1
index e825e2ef7966..ef22b4882fdb 100644
@@ -2513,7 +2513,7 @@ void rvt_add_retry_timer_ext(struct rvt_qp *qp, u8 shift)
        /* 4.096 usec. * (1 << qp->timeout) */
 	qp->s_timer.expires = jiffies + rdi->busy_jiffies +
 			      (qp->timeout_jiffies << shift);
-	add_timer(&qp->s_timer);
+	timer_add(&qp->s_timer);
 }
 EXPORT_SYMBOL(rvt_add_retry_timer_ext);
 
drivers/input/serio/hp_sdc.c +1 -1
index 0eec4c5585cb..05f6d96e0aa3 100644
@@ -908,7 +908,7 @@ static int __init hp_sdc_init(void)
 	/* Create the keepalive task */
 	timer_setup(&hp_sdc.kicker, hp_sdc_kicker, 0);
 	hp_sdc.kicker.expires = jiffies + HZ;
-	add_timer(&hp_sdc.kicker);
+	timer_add(&hp_sdc.kicker);
 
 	hp_sdc.dev_err = 0;
 	return 0;
drivers/isdn/hardware/mISDN/hfcpci.c +3 -3
index 2b05722d4dbe..75c118d59c78 100644
@@ -296,7 +296,7 @@ hfcpci_Timer(struct timer_list *t)
 	/* WD RESET */
 /*
  *	WriteReg(hc, HFCD_DATA, HFCD_CTMT, hc->hw.ctmt | 0x80);
- *	add_timer(&hc->hw.timer);
+ *	timer_add(&hc->hw.timer);
  */
 }
 
@@ -2306,7 +2306,7 @@ hfcpci_softirq(struct timer_list *unused)
 	else
 		hfc_jiffies += tics;
 	hfc_tl.expires = hfc_jiffies;
-	add_timer(&hfc_tl);
+	timer_add(&hfc_tl);
 }
 
 static int __init
@@ -2335,7 +2335,7 @@ HFC_init(void)
 		timer_setup(&hfc_tl, hfcpci_softirq, 0);
 		hfc_tl.expires = jiffies + tics;
 		hfc_jiffies = hfc_tl.expires;
-		add_timer(&hfc_tl);
+		timer_add(&hfc_tl);
 	} else
 		tics = 0; /* indicate the use of controller's timer */
 
drivers/isdn/hardware/mISDN/mISDNipac.c +1 -1
index a34ea6058960..5a083aa71886 100644
@@ -161,7 +161,7 @@ isac_fill_fifo(struct isac_hw *isac)
 		timer_delete(&isac->dch.timer);
 	}
 	isac->dch.timer.expires = jiffies + ((DBUSY_TIMER_VALUE * HZ)/1000);
-	add_timer(&isac->dch.timer);
+	timer_add(&isac->dch.timer);
 	if (isac->dch.debug & DEBUG_HW_DFIFO) {
 		char	pfx[MISDN_MAX_IDLEN + 16];
 
drivers/isdn/hardware/mISDN/mISDNisar.c +1 -1
index dace91ba412b..3c02ef9eba7f 100644
@@ -935,7 +935,7 @@ isar_pump_statev_fax(struct isar_ch *ch, u8 devt) {
 					jiffies + ((delay * HZ) / 1000);
 				test_and_set_bit(FLG_LL_CONN,
 						 &ch->bch.Flags);
-				add_timer(&ch->ftimer);
+				timer_add(&ch->ftimer);
 			} else {
 				deliver_status(ch, HW_MOD_CONNECT);
 			}
drivers/isdn/hardware/mISDN/w6692.c +1 -1
index 168fc345dcdc..a2bc981726e4 100644
@@ -297,7 +297,7 @@ W6692_fill_Dfifo(struct w6692_hw *card)
 		timer_delete(&dch->timer);
 	}
 	dch->timer.expires = jiffies + ((DBUSY_TIMER_VALUE * HZ) / 1000);
-	add_timer(&dch->timer);
+	timer_add(&dch->timer);
 	if (debug & DEBUG_HW_DFIFO) {
 		snprintf(card->log, 63, "D-send %s %d ",
 			 card->name, count);
drivers/isdn/mISDN/dsp_cmx.c +1 -1
index 53fad9487574..73280cbf846c 100644
@@ -1836,7 +1836,7 @@ dsp_cmx_send(struct timer_list *arg)
 		dsp_spl_jiffies += dsp_tics;
 
 	dsp_spl_tl.expires = dsp_spl_jiffies;
-	add_timer(&dsp_spl_tl);
+	timer_add(&dsp_spl_tl);
 
 	/* unlock */
 	spin_unlock_irqrestore(&dsp_lock, flags);
drivers/isdn/mISDN/dsp_core.c +1 -1
index d0aa415a6b09..18f6c23c5176 100644
@@ -1199,7 +1199,7 @@ static int __init dsp_init(void)
 	timer_setup(&dsp_spl_tl, dsp_cmx_send, 0);
 	dsp_spl_tl.expires = jiffies + dsp_tics;
 	dsp_spl_jiffies = dsp_spl_tl.expires;
-	add_timer(&dsp_spl_tl);
+	timer_add(&dsp_spl_tl);
 
 	return 0;
 }
drivers/isdn/mISDN/dsp_tones.c +2 -2
index fa7813ae8d97..83d9df81681a 100644
@@ -479,7 +479,7 @@ dsp_tone_timeout(struct timer_list *t)
 		dsp_tone_hw_message(dsp, pat->data[index], *(pat->siz[index]));
 	/* set timer */
 	tone->tl.expires = jiffies + (pat->seq[index] * HZ) / 8000;
-	add_timer(&tone->tl);
+	timer_add(&tone->tl);
 }
 
 
@@ -541,7 +541,7 @@ dsp_tone(struct dsp *dsp, int tone)
 		if (timer_pending(&tonet->tl))
 			timer_delete(&tonet->tl);
 		tonet->tl.expires = jiffies + (pat->seq[0] * HZ) / 8000;
-		add_timer(&tonet->tl);
+		timer_add(&tonet->tl);
 	} else {
 		tonet->software = 1;
 	}
drivers/isdn/mISDN/fsm.c +2 -2
index 825b686496d2..a577c4b77680 100644
@@ -150,7 +150,7 @@ mISDN_FsmAddTimer(struct FsmTimer *ft,
 	ft->event = event;
 	ft->arg = arg;
 	ft->tl.expires = jiffies + (millisec * HZ) / 1000;
-	add_timer(&ft->tl);
+	timer_add(&ft->tl);
 	return 0;
 }
 EXPORT_SYMBOL(mISDN_FsmAddTimer);
@@ -171,6 +171,6 @@ mISDN_FsmRestartTimer(struct FsmTimer *ft,
 	ft->event = event;
 	ft->arg = arg;
 	ft->tl.expires = jiffies + (millisec * HZ) / 1000;
-	add_timer(&ft->tl);
+	timer_add(&ft->tl);
 }
 EXPORT_SYMBOL(mISDN_FsmRestartTimer);
drivers/isdn/mISDN/l1oip_core.c +1 -1
index 16226a280c02..76da7c5b4049 100644
@@ -1424,7 +1424,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
 
 	timer_setup(&hc->keep_tl, l1oip_keepalive, 0);
 	hc->keep_tl.expires = jiffies + 2 * HZ; /* two seconds first time */
-	add_timer(&hc->keep_tl);
+	timer_add(&hc->keep_tl);
 
 	timer_setup(&hc->timeout_tl, l1oip_timeout, 0);
 	hc->timeout_on = 0; /* state that we have timer off */
drivers/isdn/mISDN/timerdev.c +1 -1
index df98144a9539..8691e70771d0 100644
@@ -187,7 +187,7 @@ misdn_add_timer(struct mISDNtimerdev *dev, int timeout)
 			dev->next_id = 1;
 		list_add_tail(&timer->list, &dev->pending);
 		timer->tl.expires = jiffies + ((HZ * (u_long)timeout) / 1000);
-		add_timer(&timer->tl);
+		timer_add(&timer->tl);
 		spin_unlock_irq(&dev->lock);
 	}
 	return id;
drivers/leds/trigger/ledtrig-pattern.c +1 -1
index 9af3c18f14f4..1aac5e087242 100644
@@ -85,7 +85,7 @@ static void pattern_trig_timer_start(struct pattern_trig_data *data)
 		hrtimer_start(&data->hrtimer, ns_to_ktime(0), HRTIMER_MODE_REL);
 	} else {
 		data->timer.expires = jiffies;
-		add_timer(&data->timer);
+		timer_add(&data->timer);
 	}
 }
 
drivers/md/bcache/stats.c +2 -2
index 0056106495a7..c32af4d987c3 100644
@@ -175,7 +175,7 @@ static void scale_accounting(struct timer_list *t)
 	acc->timer.expires += accounting_delay;
 
 	if (!atomic_read(&acc->closing))
-		add_timer(&acc->timer);
+		timer_add(&acc->timer);
 	else
 		closure_return(&acc->cl);
 }
@@ -230,5 +230,5 @@ void bch_cache_accounting_init(struct cache_accounting *acc,
 	closure_init(&acc->cl, parent);
 	timer_setup(&acc->timer, scale_accounting, 0);
 	acc->timer.expires	= jiffies + accounting_delay;
-	add_timer(&acc->timer);
+	timer_add(&acc->timer);
 }
drivers/md/dm-raid1.c +1 -1
index d2b73e7bc9cd..d8bbc87c248b 100644
@@ -115,7 +115,7 @@ static void delayed_wake(struct mirror_set *ms)
 		return;
 
 	ms->timer.expires = jiffies + HZ / 5;
-	add_timer(&ms->timer);
+	timer_add(&ms->timer);
 }
 
 static void wakeup_all_recovery_waiters(void *context)
drivers/media/dvb-core/dmxdev.c +1 -1
index 8fb5989ec31a..bf002de719a7 100644
@@ -369,7 +369,7 @@ static void dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
 	if (para->timeout) {
 		dmxdevfilter->timer.expires =
 		    jiffies + 1 + (HZ / 2 + HZ * para->timeout) / 1000;
-		add_timer(&dmxdevfilter->timer);
+		timer_add(&dmxdevfilter->timer);
 	}
 }
 
drivers/media/i2c/tc358743.c +1 -1
index 88027cbc3e61..4281f47f217b 100644
@@ -2166,7 +2166,7 @@ static int tc358743_probe(struct i2c_client *client)
 		timer_setup(&state->timer, tc358743_irq_poll_timer, 0);
 		state->timer.expires = jiffies +
 				       msecs_to_jiffies(POLL_INTERVAL_MS);
-		add_timer(&state->timer);
+		timer_add(&state->timer);
 	}
 
 	err = cec_register_adapter(state->cec_adap, &client->dev);
drivers/media/pci/bt8xx/bttv-input.c +1 -1
index 84aa269248fd..cbb80a0b491e 100644
@@ -292,7 +292,7 @@ static void bttv_ir_start(struct bttv_ir *ir)
 	if (ir->polling) {
 		timer_setup(&ir->timer, bttv_input_timer, 0);
 		ir->timer.expires  = jiffies + msecs_to_jiffies(1000);
-		add_timer(&ir->timer);
+		timer_add(&ir->timer);
 	} else if (ir->rc5_gpio) {
 		/* set timer_end for code completion */
 		timer_setup(&ir->timer, bttv_rc5_timer_end, 0);
drivers/media/pci/ivtv/ivtv-irq.c +3 -3
index 748c14e87963..ff196f2bb3a6 100644
@@ -424,7 +424,7 @@ static void ivtv_dma_enc_start_xfer(struct ivtv_stream *s)
 	write_reg(s->sg_handle, IVTV_REG_ENCDMAADDR);
 	write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x02, IVTV_REG_DMAXFER);
 	itv->dma_timer.expires = jiffies + msecs_to_jiffies(300);
-	add_timer(&itv->dma_timer);
+	timer_add(&itv->dma_timer);
 }
 
 static void ivtv_dma_dec_start_xfer(struct ivtv_stream *s)
@@ -440,7 +440,7 @@ static void ivtv_dma_dec_start_xfer(struct ivtv_stream *s)
 	write_reg(s->sg_handle, IVTV_REG_DECDMAADDR);
 	write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x01, IVTV_REG_DMAXFER);
 	itv->dma_timer.expires = jiffies + msecs_to_jiffies(300);
-	add_timer(&itv->dma_timer);
+	timer_add(&itv->dma_timer);
 }
 
 /* start the encoder DMA */
@@ -709,7 +709,7 @@ static void ivtv_irq_dma_err(struct ivtv *itv)
 				 */
 				itv->dma_timer.expires =
 						jiffies + msecs_to_jiffies(600);
-				add_timer(&itv->dma_timer);
+				timer_add(&itv->dma_timer);
 				return;
 			}
 
drivers/media/pci/saa7134/saa7134-input.c +1 -1
index 468dbe8d552f..a0bf76e3f8af 100644
@@ -484,7 +484,7 @@ int saa7134_ir_open(struct rc_dev *rc)
 	if (ir->polling) {
 		timer_setup(&ir->timer, saa7134_input_timer, 0);
 		ir->timer.expires = jiffies + HZ;
-		add_timer(&ir->timer);
+		timer_add(&ir->timer);
 	}
 
 	return 0;
drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c +2 -2
index e571042023e5..3bd0e5a2d115 100644
@@ -160,7 +160,7 @@ static void s5p_mfc_watchdog(struct timer_list *t)
 	}
 	dev->watchdog_timer.expires = jiffies +
 					msecs_to_jiffies(MFC_WATCHDOG_INTERVAL);
-	add_timer(&dev->watchdog_timer);
+	timer_add(&dev->watchdog_timer);
 }
 
 static void s5p_mfc_watchdog_worker(struct work_struct *work)
@@ -842,7 +842,7 @@ static int s5p_mfc_open(struct file *file)
 	if (dev->num_inst == 1) {
 		dev->watchdog_timer.expires = jiffies +
 					msecs_to_jiffies(MFC_WATCHDOG_INTERVAL);
-		add_timer(&dev->watchdog_timer);
+		timer_add(&dev->watchdog_timer);
 		ret = s5p_mfc_power_on(dev);
 		if (ret < 0) {
 			mfc_err("power on failed\n");
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +2 -2
index 602c37cbe177..8242e0c48dfd 100644
@@ -76,7 +76,7 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t)
 	}
 
 	fei->timer.expires = jiffies +	msecs_to_jiffies(POLL_MSECS);
-	add_timer(&fei->timer);
+	timer_add(&fei->timer);
 }
 
 static void channel_swdemux_bh_work(struct work_struct *t)
@@ -203,7 +203,7 @@ static int c8sectpfe_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 		fei->timer.expires = jiffies +
 			msecs_to_jiffies(msecs_to_jiffies(POLL_MSECS));
 
-		add_timer(&fei->timer);
+		timer_add(&fei->timer);
 	}
 
 	if (stdemux->running_feed_count == 0) {
drivers/media/radio/radio-cadet.c +2 -2
index 5110754e1a31..a05570265b25 100644
@@ -311,7 +311,7 @@ static void cadet_handler(struct timer_list *t)
 	 * Clean up and exit
 	 */
 	dev->readtimer.expires = jiffies + msecs_to_jiffies(50);
-	add_timer(&dev->readtimer);
+	timer_add(&dev->readtimer);
 }
 
 static void cadet_start_rds(struct cadet *dev)
@@ -320,7 +320,7 @@ static void cadet_start_rds(struct cadet *dev)
 	outb(0x80, dev->io);        /* Select RDS fifo */
 	timer_setup(&dev->readtimer, cadet_handler, 0);
 	dev->readtimer.expires = jiffies + msecs_to_jiffies(50);
-	add_timer(&dev->readtimer);
+	timer_add(&dev->readtimer);
 }
 
 static ssize_t cadet_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +5 -5
index 9ae5eee5ed62..a8ccb5898a80 100644
@@ -3714,7 +3714,7 @@ status);
 	}
 
 	/* Start timer */
-	add_timer(&timer.timer);
+	timer_add(&timer.timer);
 
 	/* Now wait for all I/O to complete */
 	hdw->cmd_debug_state = 4;
@@ -4286,7 +4286,7 @@ static int state_eval_encoder_config(struct pvr2_hdw *hdw)
 					hdw->encoder_wait_timer.expires =
 						jiffies + msecs_to_jiffies(
 						TIME_MSEC_ENCODER_WAIT);
-					add_timer(&hdw->encoder_wait_timer);
+					timer_add(&hdw->encoder_wait_timer);
 				}
 			}
 			/* We can't continue until we know we have been
@@ -4410,7 +4410,7 @@ static int state_eval_encoder_run(struct pvr2_hdw *hdw)
 		if (!hdw->state_encoder_runok) {
 			hdw->encoder_run_timer.expires = jiffies +
 				 msecs_to_jiffies(TIME_MSEC_ENCODER_OK);
-			add_timer(&hdw->encoder_run_timer);
+			timer_add(&hdw->encoder_run_timer);
 		}
 	}
 	trace_stbit("state_encoder_run",hdw->state_encoder_run);
@@ -4502,7 +4502,7 @@ static int state_eval_decoder_run(struct pvr2_hdw *hdw)
 					hdw->quiescent_timer.expires =
 						jiffies + msecs_to_jiffies(
 						TIME_MSEC_DECODER_WAIT);
-					add_timer(&hdw->quiescent_timer);
+					timer_add(&hdw->quiescent_timer);
 				}
 			}
 			/* Don't allow decoder to start again until it has
@@ -4527,7 +4527,7 @@ static int state_eval_decoder_run(struct pvr2_hdw *hdw)
 			hdw->decoder_stabilization_timer.expires =
 				jiffies + msecs_to_jiffies(
 				TIME_MSEC_DECODER_STABILIZATION_WAIT);
-			add_timer(&hdw->decoder_stabilization_timer);
+			timer_add(&hdw->decoder_stabilization_timer);
 		} else {
 			hdw->state_decoder_ready = !0;
 		}
drivers/misc/cardreader/rtsx_usb.c +1 -1
index 148107a4547c..b0912d493586 100644
@@ -51,7 +51,7 @@ static int rtsx_usb_bulk_transfer_sglist(struct rtsx_ucr *ucr,
 		return ret;
 
 	ucr->sg_timer.expires = jiffies + msecs_to_jiffies(timeout);
-	add_timer(&ucr->sg_timer);
+	timer_add(&ucr->sg_timer);
 	usb_sg_wait(&ucr->current_sg);
 	if (!timer_delete_sync(&ucr->sg_timer))
 		ret = -ETIMEDOUT;
drivers/misc/sgi-xp/xpc.h +1 -1
index 225f2bb84e39..726e44c3f471 100644
@@ -208,7 +208,7 @@ struct xpc_activate_mq_msg_chctl_opencomplete_uv {
 };
 
 /*
- * Functions registered by add_timer() or called by kernel_thread() only
+ * Functions registered by timer_add() or called by kernel_thread() only
  * allow for a single 64-bit argument. The following macros can be used to
  * pack and unpack two (32-bit, 16-bit or 8-bit) arguments into or out from
  * the passed argument.
drivers/misc/sgi-xp/xpc_main.c +1 -1
index ef34483ee8e2..b38e09d6aa97 100644
@@ -188,7 +188,7 @@ xpc_hb_beater(struct timer_list *unused)
 		wake_up_interruptible(&xpc_activate_IRQ_wq);
 
 	xpc_hb_timer.expires = jiffies + (xpc_hb_interval * HZ);
-	add_timer(&xpc_hb_timer);
+	timer_add(&xpc_hb_timer);
 }
 
 static void
drivers/misc/sgi-xp/xpc_partition.c +1 -1
index f983885d57e9..3beb85e17f9b 100644
@@ -377,7 +377,7 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
 	/* set a timelimit on the disengage phase of the deactivation request */
 	part->disengage_timeout = jiffies + (xpc_disengage_timelimit * HZ);
 	part->disengage_timer.expires = part->disengage_timeout;
-	add_timer(&part->disengage_timer);
+	timer_add(&part->disengage_timer);
 
 	dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n",
 		XPC_PARTID(part), reason);
drivers/mmc/host/vub300.c +3 -3
index fdf5d23b1427..e4dff077d136 100644
@@ -1450,7 +1450,7 @@ static int __command_read_data(struct vub300_mmc_host *vub300,
 			vub300->sg_transfer_timer.expires =
 				jiffies + msecs_to_jiffies(2000 +
 						  (linear_length / 16384));
-			add_timer(&vub300->sg_transfer_timer);
+			timer_add(&vub300->sg_transfer_timer);
 			usb_sg_wait(&vub300->sg_request);
 			timer_delete(&vub300->sg_transfer_timer);
 			if (vub300->sg_request.status < 0) {
@@ -1567,7 +1567,7 @@ static int __command_write_data(struct vub300_mmc_host *vub300,
 			vub300->sg_transfer_timer.expires =
 				jiffies + msecs_to_jiffies(2000 +
 							   linear_length / 16384);
-			add_timer(&vub300->sg_transfer_timer);
+			timer_add(&vub300->sg_transfer_timer);
 			usb_sg_wait(&vub300->sg_request);
 			if (cmd->error) {
 				data->bytes_xfered = 0;
@@ -2322,7 +2322,7 @@ static int vub300_probe(struct usb_interface *interface,
 	timer_setup(&vub300->inactivity_timer,
 		    vub300_inactivity_timer_expired, 0);
 	vub300->inactivity_timer.expires = jiffies + HZ;
-	add_timer(&vub300->inactivity_timer);
+	timer_add(&vub300->inactivity_timer);
 	if (vub300->card_present)
 		dev_info(&vub300->udev->dev,
 			 "USB vub300 remote SDIO host controller[%d]"
drivers/most/most_usb.c +1 -1
index cf5be9c449a5..f59a93b65ffb 100644
@@ -671,7 +671,7 @@ static void link_stat_timer_handler(struct timer_list *t)
 
 	schedule_work(&mdev->poll_work_obj);
 	mdev->link_stat_timer.expires = jiffies + (2 * HZ);
-	add_timer(&mdev->link_stat_timer);
+	timer_add(&mdev->link_stat_timer);
 }
 
 /**
drivers/net/eql.c +2 -2
index 9ba10efd3794..d7ef6b3a7a20 100644
@@ -163,7 +163,7 @@ static void eql_timer(struct timer_list *t)
 	spin_unlock(&eql->queue.lock);
 
 	eql->timer.expires = jiffies + EQL_DEFAULT_RESCHED_IVAL;
-	add_timer(&eql->timer);
+	timer_add(&eql->timer);
 }
 
 static const char version[] __initconst =
@@ -215,7 +215,7 @@ static int eql_open(struct net_device *dev)
 	eql->min_slaves = 1;
 	eql->max_slaves = EQL_DEFAULT_MAX_SLAVES; /* 4 usually... */
 
-	add_timer(&eql->timer);
+	timer_add(&eql->timer);
 
 	return 0;
 }
drivers/net/ethernet/3com/3c515.c +1 -1
index ecdea58e6a21..843035fbf7fe 100644
@@ -923,7 +923,7 @@ static void corkscrew_timer(struct timer_list *t)
 						dev->name,
 						media_tbl[dev->if_port].name);
 				vp->timer.expires = jiffies + media_tbl[dev->if_port].wait;
-				add_timer(&vp->timer);
+				timer_add(&vp->timer);
 			}
 			outw((media_status & ~(Media_10TP | Media_SQE)) |
 			     media_tbl[dev->if_port].media_bits,
drivers/net/ethernet/3com/3c574_cs.c +3 -3
index 1f2070497a75..7d0a2e4b2ae1 100644
@@ -681,7 +681,7 @@ static int el3_open(struct net_device *dev)
 	
 	tc574_reset(dev);
 	lp->media.expires = jiffies + HZ;
-	add_timer(&lp->media);
+	timer_add(&lp->media);
 	
 	dev_dbg(&link->dev, "%s: opened, status %4.4x.\n",
 		  dev->name, inw(dev->base_addr + EL3_STATUS));
@@ -882,7 +882,7 @@ static void media_check(struct timer_list *t)
 	if (lp->fast_poll) {
 		lp->fast_poll--;
 		lp->media.expires = jiffies + 2*HZ/100;
-		add_timer(&lp->media);
+		timer_add(&lp->media);
 		return;
 	}
 
@@ -927,7 +927,7 @@ static void media_check(struct timer_list *t)
 
 reschedule:
 	lp->media.expires = jiffies + HZ;
-	add_timer(&lp->media);
+	timer_add(&lp->media);
 }
 
 static struct net_device_stats *el3_get_stats(struct net_device *dev)
drivers/net/ethernet/3com/3c589_cs.c +2 -2
index ea49be43b8c3..77b8430787f9 100644
@@ -711,7 +711,7 @@ static void media_check(struct timer_list *t)
 	if (lp->fast_poll) {
 		lp->fast_poll--;
 		lp->media.expires = jiffies + HZ/100;
-		add_timer(&lp->media);
+		timer_add(&lp->media);
 		return;
 	}
 
@@ -767,7 +767,7 @@ static void media_check(struct timer_list *t)
 
 reschedule:
 	lp->media.expires = jiffies + HZ;
-	add_timer(&lp->media);
+	timer_add(&lp->media);
 }
 
 static struct net_device_stats *el3_get_stats(struct net_device *dev)
drivers/net/ethernet/8390/axnet_cs.c +2 -2
index 7c8213011b5c..80ccea96887b 100644
@@ -569,7 +569,7 @@ static void ei_watchdog(struct timer_list *t)
     if (info->fast_poll) {
 	info->fast_poll--;
 	info->watchdog.expires = jiffies + 1;
-	add_timer(&info->watchdog);
+	timer_add(&info->watchdog);
 	return;
     }
 
@@ -600,7 +600,7 @@ static void ei_watchdog(struct timer_list *t)
 
 reschedule:
     info->watchdog.expires = jiffies + HZ;
-    add_timer(&info->watchdog);
+    timer_add(&info->watchdog);
 }
 
 /*====================================================================*/
drivers/net/ethernet/8390/pcnet_cs.c +2 -2
index 19f9c5db3f3b..07ae1cc347a1 100644
@@ -1037,7 +1037,7 @@ static void ei_watchdog(struct timer_list *t)
     if (info->fast_poll) {
 	info->fast_poll--;
 	info->watchdog.expires = jiffies + 1;
-	add_timer(&info->watchdog);
+	timer_add(&info->watchdog);
 	return;
     }
 
@@ -1099,7 +1099,7 @@ static void ei_watchdog(struct timer_list *t)
 
 reschedule:
     info->watchdog.expires = jiffies + HZ;
-    add_timer(&info->watchdog);
+    timer_add(&info->watchdog);
 }
 
 /*====================================================================*/
drivers/net/ethernet/agere/et131x.c +1 -1
index 12def2cddc55..5b0274f64318 100644
@@ -3610,7 +3610,7 @@ static int et131x_open(struct net_device *netdev)
 	timer_setup(&adapter->error_timer, et131x_error_timer_handler, 0);
 	adapter->error_timer.expires = jiffies +
 		msecs_to_jiffies(TX_ERROR_PERIOD);
-	add_timer(&adapter->error_timer);
+	timer_add(&adapter->error_timer);
 
 	result = request_irq(irq, et131x_isr,
 			     IRQF_SHARED, netdev->name, netdev);
drivers/net/ethernet/amd/amd8111e.c +1 -1
index f9a936ac6731..4077a96847b0 100644
@@ -1211,7 +1211,7 @@ static int amd8111e_open(struct net_device *dev)
 	}
 	/* Start ipg timer */
 	if (lp->options & OPTION_DYN_IPG_ENABLE) {
-		add_timer(&lp->ipg_data.ipg_timer);
+		timer_add(&lp->ipg_data.ipg_timer);
 		netdev_info(dev, "Dynamic IPG Enabled\n");
 	}
 
drivers/net/ethernet/apple/bmac.c +1 -1
index afaebc58d986..c395749d10e9 100644
@@ -548,7 +548,7 @@ static inline void bmac_set_timeout(struct net_device *dev)
 	if (bp->timeout_active)
 		timer_delete(&bp->tx_timeout);
 	bp->tx_timeout.expires = jiffies + TX_TIMEOUT;
-	add_timer(&bp->tx_timeout);
+	timer_add(&bp->tx_timeout);
 	bp->timeout_active = 1;
 	spin_unlock_irqrestore(&bp->lock, flags);
 }
drivers/net/ethernet/apple/mace.c +1 -1
index af26905e44e3..cd8dfb6f1ed9 100644
@@ -525,7 +525,7 @@ static inline void mace_set_timeout(struct net_device *dev)
     if (mp->timeout_active)
 	timer_delete(&mp->tx_timeout);
     mp->tx_timeout.expires = jiffies + TX_TIMEOUT;
-    add_timer(&mp->tx_timeout);
+    timer_add(&mp->tx_timeout);
     mp->timeout_active = 1;
 }
 
drivers/net/ethernet/broadcom/b44.c +1 -1
index 8267417b3750..3db6bc4e30f5 100644
@@ -1450,7 +1450,7 @@ static int b44_open(struct net_device *dev)
 
 	timer_setup(&bp->timer, b44_timer, 0);
 	bp->timer.expires = jiffies + HZ;
-	add_timer(&bp->timer);
+	timer_add(&bp->timer);
 
 	b44_enable_ints(bp);
 
drivers/net/ethernet/broadcom/bcm63xx_enet.c +2 -2
index 92204fea1f08..986cc73f328f 100644
@@ -275,7 +275,7 @@ static int bcm_enet_refill_rx(struct net_device *dev, bool napi_mode)
 	if (priv->rx_desc_count == 0 && netif_running(dev)) {
 		dev_warn(&priv->pdev->dev, "unable to refill rx ring\n");
 		priv->rx_timeout.expires = jiffies + HZ;
-		add_timer(&priv->rx_timeout);
+		timer_add(&priv->rx_timeout);
 	}
 
 	return 0;
@@ -2091,7 +2091,7 @@ static void swphy_poll_timer(struct timer_list *t)
 	}
 
 	priv->swphy_poll.expires = jiffies + HZ;
-	add_timer(&priv->swphy_poll);
+	timer_add(&priv->swphy_poll);
 }
 
 /*
drivers/net/ethernet/broadcom/tg3.c +2 -2
index abbf81f06aa0..d8ce97f20cdf 100644
@@ -11220,7 +11220,7 @@ static void tg3_timer(struct timer_list *t)
 
 restart_timer:
 	tp->timer.expires = jiffies + tp->timer_offset;
-	add_timer(&tp->timer);
+	timer_add(&tp->timer);
 }
 
 static void tg3_timer_init(struct tg3 *tp)
@@ -11247,7 +11247,7 @@ static void tg3_timer_start(struct tg3 *tp)
 	tp->timer_counter = tp->timer_multiplier;
 
 	tp->timer.expires = jiffies + tp->timer_offset;
-	add_timer(&tp->timer);
+	timer_add(&tp->timer);
 }
 
 static void tg3_timer_stop(struct tg3 *tp)
drivers/net/ethernet/dec/tulip/21142.c +3 -3
index 76767dec216d..09c2682ae07c 100644
@@ -101,7 +101,7 @@ void t21142_media_task(struct work_struct *work)
 		next_tick = 3*HZ;
 	}
 
-	/* mod_timer synchronizes us with potential add_timer calls
+	/* mod_timer synchronizes us with potential timer_add calls
 	 * from interrupts.
 	 */
 	mod_timer(&tp->timer, RUN_AT(next_tick));
@@ -219,7 +219,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
 		timer_delete_sync(&tp->timer);
 		t21142_start_nway(dev);
 		tp->timer.expires = RUN_AT(3*HZ);
-		add_timer(&tp->timer);
+		timer_add(&tp->timer);
 	} else if (dev->if_port == 3  ||  dev->if_port == 5) {
 		if (tulip_debug > 1)
 			dev_info(&dev->dev, "21143 %s link beat %s\n",
@@ -229,7 +229,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
 			timer_delete_sync(&tp->timer);
 			t21142_start_nway(dev);
 			tp->timer.expires = RUN_AT(3*HZ);
-			add_timer(&tp->timer);
+			timer_add(&tp->timer);
 		} else if (dev->if_port == 5)
 			iowrite32(csr14 & ~0x080, ioaddr + CSR14);
 	} else if (dev->if_port == 0  ||  dev->if_port == 4) {
drivers/net/ethernet/dec/tulip/de2104x.c +4 -4
index f9504f340c4a..0bc15c31023a 100644
@@ -976,7 +976,7 @@ static void de21040_media_timer (struct timer_list *t)
 			goto no_link_yet;
 
 		de->media_timer.expires = jiffies + DE_TIMER_LINK;
-		add_timer(&de->media_timer);
+		timer_add(&de->media_timer);
 		if (!netif_carrier_ok(dev))
 			de_link_up(de);
 		else
@@ -1006,7 +1006,7 @@ static void de21040_media_timer (struct timer_list *t)
 
 no_link_yet:
 	de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
-	add_timer(&de->media_timer);
+	timer_add(&de->media_timer);
 
 	netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
 		   media_name[de->media_type], status);
@@ -1063,7 +1063,7 @@ static void de21041_media_timer (struct timer_list *t)
 			goto no_link_yet;
 
 		de->media_timer.expires = jiffies + DE_TIMER_LINK;
-		add_timer(&de->media_timer);
+		timer_add(&de->media_timer);
 		if (!netif_carrier_ok(dev))
 			de_link_up(de);
 		else
@@ -1142,7 +1142,7 @@ static void de21041_media_timer (struct timer_list *t)
 
 no_link_yet:
 	de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
-	add_timer(&de->media_timer);
+	timer_add(&de->media_timer);
 
 	netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
 		   media_name[de->media_type], status);
drivers/net/ethernet/dec/tulip/dmfe.c +4 -4
index 2d3bd343b6e6..b6c775432fd9 100644
@@ -584,7 +584,7 @@ static int dmfe_open(struct net_device *dev)
 	/* set and active a timer process */
 	timer_setup(&db->timer, dmfe_timer, 0);
 	db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
-	add_timer(&db->timer);
+	timer_add(&db->timer);
 
 	return 0;
 }
@@ -1137,7 +1137,7 @@ static void dmfe_timer(struct timer_list *t)
 			db->cr6_data |= 0x40000;
 			update_cr6(db->cr6_data, ioaddr);
 			db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
-			add_timer(&db->timer);
+			timer_add(&db->timer);
 			spin_unlock_irqrestore(&db->lock, flags);
 			return;
 		}
@@ -1176,7 +1176,7 @@ static void dmfe_timer(struct timer_list *t)
 		dmfe_dynamic_reset(dev);
 		db->first_in_callback = 0;
 		db->timer.expires = DMFE_TIMER_WUT;
-		add_timer(&db->timer);
+		timer_add(&db->timer);
 		spin_unlock_irqrestore(&db->lock, flags);
 		return;
 	}
@@ -1258,7 +1258,7 @@ static void dmfe_timer(struct timer_list *t)
 
 	/* Timer active again */
 	db->timer.expires = DMFE_TIMER_WUT;
-	add_timer(&db->timer);
+	timer_add(&db->timer);
 	spin_unlock_irqrestore(&db->lock, flags);
 }
 
drivers/net/ethernet/dec/tulip/pnic2.c +3 -3
index 39c410bf224e..181a2612f00a 100644
@@ -326,7 +326,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
 		timer_delete_sync(&tp->timer);
 		pnic2_start_nway(dev);
 		tp->timer.expires = RUN_AT(3*HZ);
-		add_timer(&tp->timer);
+		timer_add(&tp->timer);
 
                 return;
 	}
@@ -351,7 +351,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
 			timer_delete_sync(&tp->timer);
 			pnic2_start_nway(dev);
 			tp->timer.expires = RUN_AT(3*HZ);
-			add_timer(&tp->timer);
+			timer_add(&tp->timer);
                 }
 
                 return;
@@ -375,7 +375,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
 			timer_delete_sync(&tp->timer);
 			pnic2_start_nway(dev);
 			tp->timer.expires = RUN_AT(3*HZ);
-			add_timer(&tp->timer);
+			timer_add(&tp->timer);
                 }
 
                 return;
drivers/net/ethernet/dec/tulip/timer.c +2 -2
index ca0c509b601c..88d771c24d74 100644
@@ -130,7 +130,7 @@ void tulip_media_task(struct work_struct *work)
 	}
 	spin_unlock_irqrestore(&tp->lock, flags);
 
-	/* mod_timer synchronizes us with potential add_timer calls
+	/* mod_timer synchronizes us with potential timer_add calls
 	 * from interrupts.
 	 */
 	mod_timer(&tp->timer, RUN_AT(next_tick));
@@ -164,7 +164,7 @@ void comet_timer(struct timer_list *t)
 		netdev_dbg(dev, "Comet link status %04x partner capability %04x\n",
 			   tulip_mdio_read(dev, tp->phys[0], 1),
 			   tulip_mdio_read(dev, tp->phys[0], 5));
-	/* mod_timer synchronizes us with potential add_timer calls
+	/* mod_timer synchronizes us with potential timer_add calls
 	 * from interrupts.
 	 */
 	if (tulip_check_duplex(dev) < 0)
drivers/net/ethernet/dec/tulip/tulip_core.c +1 -1
index cd3da0e9a183..84ec9f990f21 100644
@@ -492,7 +492,7 @@ static void tulip_up(struct net_device *dev)
 	/* Set the timer to switch to check for link beat and perhaps switch
 	   to an alternate media type. */
 	tp->timer.expires = RUN_AT(next_tick);
-	add_timer(&tp->timer);
+	timer_add(&tp->timer);
 #ifdef CONFIG_TULIP_NAPI
 	timer_setup(&tp->oom_timer, oom_timer, 0);
 #endif
drivers/net/ethernet/dec/tulip/uli526x.c +3 -3
index 6e4d8d31aba9..1693cd403723 100644
@@ -484,7 +484,7 @@ static int uli526x_open(struct net_device *dev)
 	/* set and active a timer process */
 	timer_setup(&db->timer, uli526x_timer, 0);
 	db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
-	add_timer(&db->timer);
+	timer_add(&db->timer);
 
 	return 0;
 }
@@ -1052,7 +1052,7 @@ static void uli526x_timer(struct timer_list *t)
 		db->reset_count++;
 		uli526x_dynamic_reset(dev);
 		db->timer.expires = ULI526X_TIMER_WUT;
-		add_timer(&db->timer);
+		timer_add(&db->timer);
 		spin_unlock_irqrestore(&db->lock, flags);
 		return;
 	}
@@ -1114,7 +1114,7 @@ static void uli526x_timer(struct timer_list *t)
 
 	/* Timer active again */
 	db->timer.expires = ULI526X_TIMER_WUT;
-	add_timer(&db->timer);
+	timer_add(&db->timer);
 	spin_unlock_irqrestore(&db->lock, flags);
 }
 
drivers/net/ethernet/dec/tulip/winbond-840.c +2 -2
index ded7d1855e0f..4f988135e0b0 100644
@@ -646,7 +646,7 @@ static int netdev_open(struct net_device *dev)
 	/* Set the timer to check for link beat. */
 	timer_setup(&np->timer, netdev_timer, 0);
 	np->timer.expires = jiffies + 1*HZ;
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 	return 0;
 out_err:
 	netif_device_attach(dev);
@@ -775,7 +775,7 @@ static void netdev_timer(struct timer_list *t)
 	update_csr6(dev, update_link(dev));
 	spin_unlock_irq(&np->lock);
 	np->timer.expires = jiffies + 10*HZ;
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 }
 
 static void init_rxtx_rings(struct net_device *dev)
drivers/net/ethernet/dlink/dl2k.c +3 -3
index dc1ff862e04b..b6644a2882ca 100644
@@ -637,7 +637,7 @@ static int rio_open(struct net_device *dev)
 
 	timer_setup(&np->timer, rio_timer, 0);
 	np->timer.expires = jiffies + 1 * HZ;
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 
 	netif_start_queue (dev);
 
@@ -685,7 +685,7 @@ rio_timer (struct timer_list *t)
 	} /* end if */
 	spin_unlock_irqrestore (&np->rx_lock, flags);
 	np->timer.expires = jiffies + next_tick;
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 }
 
 static void
@@ -1835,7 +1835,7 @@ static int rio_resume(struct device *device)
 	rio_reset_ring(np);
 	rio_hw_init(dev);
 	np->timer.expires = jiffies + 1 * HZ;
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 	netif_device_attach(dev);
 	dl2k_enable_int(np);
 
drivers/net/ethernet/fealnx.c +3 -3
index 6ac8547ef9b8..99f68da357f5 100644
@@ -905,7 +905,7 @@ static int netdev_open(struct net_device *dev)
 	np->timer.expires = RUN_AT(3 * HZ);
 
 	/* timer handler */
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 
 	timer_setup(&np->reset_timer, reset_timer, 0);
 	np->reset_timer_armed = 0;
@@ -1104,7 +1104,7 @@ static void netdev_timer(struct timer_list *t)
 	spin_unlock_irqrestore(&np->lock, flags);
 
 	np->timer.expires = RUN_AT(10 * HZ);
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 }
 
 
@@ -1568,7 +1568,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
 			if (!np->reset_timer_armed) {
 				np->reset_timer_armed = 1;
 				np->reset_timer.expires = RUN_AT(HZ/2);
-				add_timer(&np->reset_timer);
+				timer_add(&np->reset_timer);
 				stop_nic_rxtx(ioaddr, 0);
 				netif_stop_queue(dev);
 				/* or netif_tx_disable(dev); ?? */
drivers/net/ethernet/marvell/mv643xx_eth.c +2 -2
index 5006696eb93d..a056094f02ee 100644
@@ -2452,7 +2452,7 @@ static int mv643xx_eth_open(struct net_device *dev)
 
 	if (mp->oom) {
 		mp->rx_oom.expires = jiffies + (HZ / 10);
-		add_timer(&mp->rx_oom);
+		timer_add(&mp->rx_oom);
 	}
 
 	for (i = 0; i < mp->txq_count; i++) {
@@ -2465,7 +2465,7 @@ static int mv643xx_eth_open(struct net_device *dev)
 		mp->int_mask |= INT_TX_END_0 << i;
 	}
 
-	add_timer(&mp->mib_counters_timer);
+	timer_add(&mp->mib_counters_timer);
 	port_start(mp);
 
 	wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX);
drivers/net/ethernet/marvell/pxa168_eth.c +1 -1
index e4cfdc8bc055..99fab31505bd 100644
@@ -347,7 +347,7 @@ static void rxq_refill(struct net_device *dev)
 	 */
 	if (pep->rx_desc_count == 0) {
 		pep->timeout.expires = jiffies + (HZ / 10);
-		add_timer(&pep->timeout);
+		timer_add(&pep->timeout);
 	}
 }
 
drivers/net/ethernet/mellanox/mlx4/catas.c +1 -1
index edcc6f662618..38a9c51c7f43 100644
@@ -298,7 +298,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev)
 
 	priv->catas_err.timer.expires  =
 		round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL);
-	add_timer(&priv->catas_err.timer);
+	timer_add(&priv->catas_err.timer);
 }
 
 void mlx4_stop_catas_poll(struct mlx4_dev *dev)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +1 -1
index d70351815d7c..75b3a1561f92 100644
@@ -305,7 +305,7 @@ static void mlx5_start_sync_reset_poll(struct mlx5_core_dev *dev)
 
 	timer_setup(&fw_reset->timer, poll_sync_reset, 0);
 	fw_reset->timer.expires = round_jiffies(jiffies + MLX5_RESET_POLL_INTERVAL);
-	add_timer(&fw_reset->timer);
+	timer_add(&fw_reset->timer);
 }
 
 static int mlx5_fw_reset_set_reset_sync_ack(struct mlx5_core_dev *dev)
drivers/net/ethernet/mellanox/mlx5/core/health.c +1 -1
index e96eb0a8e511..c2a7fe22367e 100644
@@ -837,7 +837,7 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev)
 	health->health_counter = &dev->iseg->health_counter;
 
 	health->timer.expires = jiffies + msecs_to_jiffies(poll_interval_ms);
-	add_timer(&health->timer);
+	timer_add(&health->timer);
 }
 
 void mlx5_stop_health_poll(struct mlx5_core_dev *dev, bool disable_health)
drivers/net/ethernet/micrel/ksz884x.c +3 -3
index bdf42518d431..aef253be1e77 100644
@@ -3935,7 +3935,7 @@ static void ksz_start_timer(struct ksz_timer_info *info, int time)
 {
 	info->cnt = 0;
 	info->timer.expires = jiffies + time;
-	add_timer(&info->timer);
+	timer_add(&info->timer);
 
 	/* infinity */
 	info->max = -1;
@@ -3969,12 +3969,12 @@ static void ksz_update_timer(struct ksz_timer_info *info)
 	if (info->max > 0) {
 		if (info->cnt < info->max) {
 			info->timer.expires = jiffies + info->period;
-			add_timer(&info->timer);
+			timer_add(&info->timer);
 		} else
 			info->max = 0;
 	} else if (info->max < 0) {
 		info->timer.expires = jiffies + info->period;
-		add_timer(&info->timer);
+		timer_add(&info->timer);
 	}
 }
 
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 -1
index e611ff7fa3fa..5639306c525d 100644
@@ -2449,7 +2449,7 @@ static int myri10ge_open(struct net_device *dev)
 
 	mgp->running = MYRI10GE_ETH_RUNNING;
 	mgp->watchdog_timer.expires = jiffies + myri10ge_watchdog_timeout * HZ;
-	add_timer(&mgp->watchdog_timer);
+	timer_add(&mgp->watchdog_timer);
 	netif_tx_wake_all_queues(dev);
 
 	return 0;
drivers/net/ethernet/natsemi/natsemi.c +1 -1
index 12ff5a4c6e44..5d838369607f 100644
@@ -1570,7 +1570,7 @@ static int netdev_open(struct net_device *dev)
 	/* Set the timer to check for link beat. */
 	timer_setup(&np->timer, netdev_timer, 0);
 	np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ);
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 
 	return 0;
 }
drivers/net/ethernet/packetengines/hamachi.c +2 -2
index b0de7e9f12a5..abf77c8a9651 100644
@@ -987,7 +987,7 @@ static int hamachi_open(struct net_device *dev)
 	/* Set the timer to check for link beat. */
 	timer_setup(&hmp->timer, hamachi_timer, 0);
 	hmp->timer.expires = RUN_AT((24*HZ)/10);			/* 2.4 sec. */
-	add_timer(&hmp->timer);
+	timer_add(&hmp->timer);
 
 	return 0;
 }
@@ -1045,7 +1045,7 @@ static void hamachi_timer(struct timer_list *t)
 	}
 	/* We could do something here... nah. */
 	hmp->timer.expires = RUN_AT(next_tick);
-	add_timer(&hmp->timer);
+	timer_add(&hmp->timer);
 }
 
 static void hamachi_tx_timeout(struct net_device *dev, unsigned int txqueue)
drivers/net/ethernet/packetengines/yellowfin.c +2 -2
index 1e25ac13a7d8..00f44d83528c 100644
@@ -641,7 +641,7 @@ static int yellowfin_open(struct net_device *dev)
 	/* Set the timer to check for link beat. */
 	timer_setup(&yp->timer, yellowfin_timer, 0);
 	yp->timer.expires = jiffies + 3*HZ;
-	add_timer(&yp->timer);
+	timer_add(&yp->timer);
 out:
 	return rc;
 
@@ -681,7 +681,7 @@ static void yellowfin_timer(struct timer_list *t)
 	}
 
 	yp->timer.expires = jiffies + next_tick;
-	add_timer(&yp->timer);
+	timer_add(&yp->timer);
 }
 
 static void yellowfin_tx_timeout(struct net_device *dev, unsigned int txqueue)
drivers/net/ethernet/realtek/atp.c +2 -2
index 0d65434982a2..ac389394c139 100644
@@ -444,7 +444,7 @@ static int net_open(struct net_device *dev)
 	lp->dev = dev;
 	timer_setup(&lp->timer, atp_timed_checker, 0);
 	lp->timer.expires = jiffies + TIMED_CHECKER;
-	add_timer(&lp->timer);
+	timer_add(&lp->timer);
 
 	netif_start_queue(dev);
 	return 0;
@@ -748,7 +748,7 @@ static void atp_timed_checker(struct timer_list *t)
 	}
 	spin_unlock(&lp->lock);
 	lp->timer.expires = jiffies + TIMED_CHECKER;
-	add_timer(&lp->timer);
+	timer_add(&lp->timer);
 }
 #endif
 
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +2 -2
index f0da8f118ab8..cbbec53e9957 100644
@@ -132,7 +132,7 @@ bool sxgbe_eee_init(struct sxgbe_priv_data * const priv)
 
 		timer_setup(&priv->eee_ctrl_timer, sxgbe_eee_ctrl_timer, 0);
 		priv->eee_ctrl_timer.expires = SXGBE_LPI_TIMER(eee_timer);
-		add_timer(&priv->eee_ctrl_timer);
+		timer_add(&priv->eee_ctrl_timer);
 
 		priv->hw->mac->set_eee_timer(priv->ioaddr,
 					     SXGBE_DEFAULT_LPI_TIMER,
@@ -1034,7 +1034,7 @@ static void sxgbe_tx_init_coalesce(struct sxgbe_priv_data *priv)
 		p->tx_coal_timer = SXGBE_COAL_TX_TIMER;
 		timer_setup(&p->txtimer, sxgbe_tx_timer, 0);
 		p->txtimer.expires = SXGBE_COAL_TIMER(p->tx_coal_timer);
-		add_timer(&p->txtimer);
+		timer_add(&p->txtimer);
 	}
 }
 
drivers/net/ethernet/seeq/ether3.c +1 -1
index 20dad39b5ab9..c227d5a762a9 100644
@@ -183,7 +183,7 @@ static inline void ether3_ledon(struct net_device *dev)
 {
 	timer_delete(&priv(dev)->timer);
 	priv(dev)->timer.expires = jiffies + HZ / 50; /* leave on for 1/50th second */
-	add_timer(&priv(dev)->timer);
+	timer_add(&priv(dev)->timer);
 	if (priv(dev)->regs.config2 & CFG2_CTRLO)
 		ether3_outw(priv(dev)->regs.config2 &= ~CFG2_CTRLO, REG_CONFIG2);
 }
drivers/net/ethernet/sgi/ioc3-eth.c +2 -2
index 39731069d99e..5195bbd7d882 100644
@@ -577,7 +577,7 @@ static void ioc3_timer(struct timer_list *t)
 	ioc3_setup_duplex(ip);
 
 	ip->ioc3_timer.expires = jiffies + ((12 * HZ) / 10); /* 1.2s */
-	add_timer(&ip->ioc3_timer);
+	timer_add(&ip->ioc3_timer);
 }
 
 /* Try to find a PHY.  There is no apparent relation between the MII addresses
@@ -604,7 +604,7 @@ static int ioc3_mii_init(struct ioc3_private *ip)
 static void ioc3_mii_start(struct ioc3_private *ip)
 {
 	ip->ioc3_timer.expires = jiffies + (12 * HZ) / 10;  /* 1.2 sec. */
-	add_timer(&ip->ioc3_timer);
+	timer_add(&ip->ioc3_timer);
 }
 
 static inline void ioc3_tx_unmap(struct ioc3_private *ip, int entry)
drivers/net/ethernet/sis/sis190.c +1 -1
index 15e46e6ac262..c157aeea2f57 100644
@@ -1044,7 +1044,7 @@ static inline void sis190_request_timer(struct net_device *dev)
 
 	timer_setup(timer, sis190_phy_timer, 0);
 	timer->expires = jiffies + SIS190_PHY_TIMEOUT;
-	add_timer(timer);
+	timer_add(timer);
 }
 
 static void sis190_set_rxbufsize(struct sis190_private *tp,
drivers/net/ethernet/sis/sis900.c +2 -2
index 3172f898171d..f03a59300368 100644
@@ -1077,7 +1077,7 @@ sis900_open(struct net_device *net_dev)
 	   to an alternate media type. */
 	timer_setup(&sis_priv->timer, sis900_timer, 0);
 	sis_priv->timer.expires = jiffies + HZ;
-	add_timer(&sis_priv->timer);
+	timer_add(&sis_priv->timer);
 
 	return 0;
 }
@@ -1360,7 +1360,7 @@ static void sis900_timer(struct timer_list *t)
 	}
 
 	sis_priv->timer.expires = jiffies + next_tick;
-	add_timer(&sis_priv->timer);
+	timer_add(&sis_priv->timer);
 }
 
 /**
drivers/net/ethernet/smsc/epic100.c +2 -2
index 45f703fe0e5a..15489b02000e 100644
@@ -746,7 +746,7 @@ static int epic_open(struct net_device *dev)
 	   to an alternate media type. */
 	timer_setup(&ep->timer, epic_timer, 0);
 	ep->timer.expires = jiffies + 3*HZ;
-	add_timer(&ep->timer);
+	timer_add(&ep->timer);
 
 	return rc;
 }
@@ -865,7 +865,7 @@ static void epic_timer(struct timer_list *t)
 	check_media(dev);
 
 	ep->timer.expires = jiffies + next_tick;
-	add_timer(&ep->timer);
+	timer_add(&ep->timer);
 }
 
 static void epic_tx_timeout(struct net_device *dev, unsigned int txqueue)
drivers/net/ethernet/smsc/smc91c92_cs.c +2 -2
index cc0c75694351..bf57a5b4647a 100644
@@ -1756,7 +1756,7 @@ static void media_check(struct timer_list *t)
     if (smc->fast_poll) {
 	smc->fast_poll--;
 	smc->media.expires = jiffies + HZ/100;
-	add_timer(&smc->media);
+	timer_add(&smc->media);
 	return;
     }
 
@@ -1828,7 +1828,7 @@ static void media_check(struct timer_list *t)
 
 reschedule:
     smc->media.expires = jiffies + HZ;
-    add_timer(&smc->media);
+    timer_add(&smc->media);
     SMC_SELECT_BANK(saved_bank);
     spin_unlock_irqrestore(&smc->lock, flags);
 }
drivers/net/ethernet/sun/niu.c +5 -5
index 2f185827abba..c0dd496791f8 100644
@@ -2239,7 +2239,7 @@ static void niu_timer(struct timer_list *t)
 		off = 1 * HZ;
 	np->timer.expires = jiffies + off;
 
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 }
 
 static const struct niu_phy_ops phy_ops_10g_serdes = {
@@ -6144,7 +6144,7 @@ static int niu_open(struct net_device *dev)
 	if (np->link_config.loopback_mode != LOOPBACK_DISABLED)
 		netif_carrier_on(dev);
 
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 
 	return 0;
 
@@ -6529,7 +6529,7 @@ static void niu_reset_task(struct work_struct *work)
 	err = niu_init_hw(np);
 	if (!err) {
 		np->timer.expires = jiffies + HZ;
-		add_timer(&np->timer);
+		timer_add(&np->timer);
 		niu_netif_start(np);
 	}
 
@@ -6792,7 +6792,7 @@ static int niu_change_mtu(struct net_device *dev, int new_mtu)
 		if (np->link_config.loopback_mode != LOOPBACK_DISABLED)
 			netif_carrier_on(dev);
 
-		add_timer(&np->timer);
+		timer_add(&np->timer);
 	}
 
 	return err;
@@ -9947,7 +9947,7 @@ static int __maybe_unused niu_resume(struct device *dev_d)
 	err = niu_init_hw(np);
 	if (!err) {
 		np->timer.expires = jiffies + HZ;
-		add_timer(&np->timer);
+		timer_add(&np->timer);
 		niu_netif_start(np);
 	}
 
drivers/net/ethernet/sun/sunbmac.c +2 -2
index edb2fd3a6551..aed3b2c31faa 100644
@@ -573,7 +573,7 @@ static void bigmac_timer(struct timer_list *t)
 
 	if (restart_timer != 0) {
 		bp->bigmac_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2 sec. */
-		add_timer(&bp->bigmac_timer);
+		timer_add(&bp->bigmac_timer);
 	}
 }
 
@@ -614,7 +614,7 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp)
 	bp->timer_state = ltrywait;
 	bp->timer_ticks = 0;
 	bp->bigmac_timer.expires = jiffies + (12 * HZ) / 10;
-	add_timer(&bp->bigmac_timer);
+	timer_add(&bp->bigmac_timer);
 }
 
 static int bigmac_init_hw(struct bigmac *bp, bool non_blocking)
drivers/net/ethernet/sun/sunhme.c +2 -2
index 4bc0e114d5ee..37db34f35dec 100644
@@ -716,7 +716,7 @@ happy_meal_begin_auto_negotiation(struct happy_meal *hp,
 
 	hp->timer_ticks = 0;
 	hp->happy_timer.expires = jiffies + (12 * HZ)/10;  /* 1.2 sec. */
-	add_timer(&hp->happy_timer);
+	timer_add(&hp->happy_timer);
 }
 
 static void happy_meal_timer(struct timer_list *t)
@@ -887,7 +887,7 @@ static void happy_meal_timer(struct timer_list *t)
 
 	if (restart_timer) {
 		hp->happy_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2 sec. */
-		add_timer(&hp->happy_timer);
+		timer_add(&hp->happy_timer);
 	}
 
 out:
drivers/net/ethernet/ti/cpsw_ale.c +2 -2
index fbe35af615a6..2a31c8c02d51 100644
@@ -1237,7 +1237,7 @@ static void cpsw_ale_timer(struct timer_list *t)
 
 	if (ale->ageout) {
 		ale->timer.expires = jiffies + ale->ageout;
-		add_timer(&ale->timer);
+		timer_add(&ale->timer);
 	}
 }
 
@@ -1274,7 +1274,7 @@ static void cpsw_ale_aging_start(struct cpsw_ale *ale)
 
 	timer_setup(&ale->timer, cpsw_ale_timer, 0);
 	ale->timer.expires = jiffies + ale->ageout;
-	add_timer(&ale->timer);
+	timer_add(&ale->timer);
 }
 
 static void cpsw_ale_aging_stop(struct cpsw_ale *ale)
drivers/net/ethernet/ti/netcp_ethss.c +2 -2
index 55a1a96cd834..569cdb83bc36 100644
@@ -2861,7 +2861,7 @@ static void netcp_ethss_timer(struct timer_list *t)
 	spin_unlock(&gbe_dev->hw_stats_lock);
 
 	gbe_dev->timer.expires	= jiffies + GBE_TIMER_INTERVAL;
-	add_timer(&gbe_dev->timer);
+	timer_add(&gbe_dev->timer);
 }
 
 static int gbe_txhook(int order, void *data, struct netcp_packet *p_info)
@@ -3725,7 +3725,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,
 
 	timer_setup(&gbe_dev->timer, netcp_ethss_timer, 0);
 	gbe_dev->timer.expires	 = jiffies + GBE_TIMER_INTERVAL;
-	add_timer(&gbe_dev->timer);
+	timer_add(&gbe_dev->timer);
 	*inst_priv = gbe_dev;
 	return 0;
 
drivers/net/ethernet/ti/tlan.c +6 -6
index a55b0f951181..fb7a23dead36 100644
@@ -1409,7 +1409,7 @@ static u32 tlan_handle_tx_eof(struct net_device *dev, u16 host_int)
 			priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
 			priv->timer_set_at = jiffies;
 			priv->timer_type = TLAN_TIMER_ACTIVITY;
-			add_timer(&priv->timer);
+			timer_add(&priv->timer);
 		} else if (priv->timer_type == TLAN_TIMER_ACTIVITY) {
 			priv->timer_set_at = jiffies;
 		}
@@ -1560,7 +1560,7 @@ static u32 tlan_handle_rx_eof(struct net_device *dev, u16 host_int)
 			priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
 			priv->timer_set_at = jiffies;
 			priv->timer_type = TLAN_TIMER_ACTIVITY;
-			add_timer(&priv->timer);
+			timer_add(&priv->timer);
 		} else if (priv->timer_type == TLAN_TIMER_ACTIVITY) {
 			priv->timer_set_at = jiffies;
 		}
@@ -1790,7 +1790,7 @@ ThunderLAN driver timer function
  *		Nothing
  *	Parms:
  *		data	A value given to add timer when
- *			add_timer was called.
+ *			timer_add was called.
  *
  *	This function handles timed functionality for the
  *	TLAN driver.  The two current timer uses are for
@@ -1852,7 +1852,7 @@ static void tlan_timer(struct timer_list *t)
 				priv->timer.expires = priv->timer_set_at
 					+ TLAN_TIMER_ACT_DELAY;
 				spin_unlock_irqrestore(&priv->lock, flags);
-				add_timer(&priv->timer);
+				timer_add(&priv->timer);
 				break;
 			}
 		}
@@ -2291,7 +2291,7 @@ tlan_finish_reset(struct net_device *dev)
 				netdev_info(dev, "Link active\n");
 			/* Enabling link beat monitoring */
 			priv->media_timer.expires = jiffies + HZ;
-			add_timer(&priv->media_timer);
+			timer_add(&priv->media_timer);
 		}
 	}
 
@@ -2789,7 +2789,7 @@ static void tlan_phy_monitor(struct timer_list *t)
 		netif_carrier_on(dev);
 	}
 	priv->media_timer.expires = jiffies + HZ;
-	add_timer(&priv->media_timer);
+	timer_add(&priv->media_timer);
 }
 
 
drivers/net/fddi/defza.c +2 -2
index 2098c3068d34..6ea44aaefafe 100644
@@ -1025,7 +1025,7 @@ static irqreturn_t fza_interrupt(int irq, void *dev_id)
 			fza_do_reset(fp);
 			fp->timer_state = 0;
 			fp->reset_timer.expires = jiffies + 45 * HZ;
-			add_timer(&fp->reset_timer);
+			timer_add(&fp->reset_timer);
 			break;
 
 		default:
@@ -1067,7 +1067,7 @@ static void fza_reset_timer(struct timer_list *t)
 		fp->timer_state = 0;
 		fp->reset_timer.expires = jiffies + 45 * HZ;
 	}
-	add_timer(&fp->reset_timer);
+	timer_add(&fp->reset_timer);
 }
 
 static int fza_set_mac_address(struct net_device *dev, void *addr)
drivers/net/hamradio/scc.c +4 -4
index ae5048efde68..d8d56909291f 100644
@@ -1009,7 +1009,7 @@ static void __scc_start_tx_timer(struct scc_channel *scc,
 	{
 		scc->tx_t.function = handler;
 		scc->tx_t.expires = jiffies + (when*HZ)/100;
-		add_timer(&scc->tx_t);
+		timer_add(&scc->tx_t);
 	}
 }
 
@@ -1035,7 +1035,7 @@ static void scc_start_defer(struct scc_channel *scc)
 	{
 		scc->tx_wdog.function = t_busy;
 		scc->tx_wdog.expires = jiffies + HZ*scc->kiss.maxdefer;
-		add_timer(&scc->tx_wdog);
+		timer_add(&scc->tx_wdog);
 	}
 	spin_unlock_irqrestore(&scc->lock, flags);
 }
@@ -1051,7 +1051,7 @@ static void scc_start_maxkeyup(struct scc_channel *scc)
 	{
 		scc->tx_wdog.function = t_maxkeyup;
 		scc->tx_wdog.expires = jiffies + HZ*scc->kiss.maxkeyup;
-		add_timer(&scc->tx_wdog);
+		timer_add(&scc->tx_wdog);
 	}
 	spin_unlock_irqrestore(&scc->lock, flags);
 }
@@ -1432,7 +1432,7 @@ scc_start_calibrate(struct scc_channel *scc, int duration, unsigned char pattern
 
 	scc->tx_wdog.function = scc_stop_calibrate;
 	scc->tx_wdog.expires = jiffies + HZ*duration;
-	add_timer(&scc->tx_wdog);
+	timer_add(&scc->tx_wdog);
 
 	/* This doesn't seem to work. Why not? */	
 	wr(scc, R6, 0);
drivers/net/hamradio/yam.c +2 -2
index f29997b20fd7..6f8e3e11da68 100644
@@ -642,7 +642,7 @@ static void yam_dotimer(struct timer_list *unused)
 			yam_arbitrate(dev);
 	}
 	yam_timer.expires = jiffies + HZ / 100;
-	add_timer(&yam_timer);
+	timer_add(&yam_timer);
 }
 
 static void yam_tx_byte(struct net_device *dev, struct yam_port *yp)
@@ -1139,7 +1139,7 @@ static int __init yam_init_driver(void)
 
 	timer_setup(&yam_timer, yam_dotimer, 0);
 	yam_timer.expires = jiffies + HZ / 100;
-	add_timer(&yam_timer);
+	timer_add(&yam_timer);
 
 	proc_create_seq("yam", 0444, init_net.proc_net, &yam_seqops);
 	return 0;
drivers/net/hippi/rrunner.c +2 -2
index 7b7e7a47a75e..77c834ad27fe 100644
@@ -1176,7 +1176,7 @@ static void rr_timer(struct timer_list *t)
 		}
 	}
 	rrpriv->timer.expires = RUN_AT(5*HZ);
-	add_timer(&rrpriv->timer);
+	timer_add(&rrpriv->timer);
 }
 
 
@@ -1235,7 +1235,7 @@ static int rr_open(struct net_device *dev)
 	   to an alternate media type. */
 	timer_setup(&rrpriv->timer, rr_timer, 0);
 	rrpriv->timer.expires = RUN_AT(5*HZ);           /* 5 sec. watchdog */
-	add_timer(&rrpriv->timer);
+	timer_add(&rrpriv->timer);
 
 	netif_start_queue(dev);
 
drivers/net/slip/slip.c +2 -2
index c889fb374703..1a2950f95221 100644
@@ -838,11 +838,11 @@ static int slip_open(struct tty_struct *tty)
 #ifdef CONFIG_SLIP_SMART
 	if (sl->keepalive) {
 		sl->keepalive_timer.expires = jiffies + sl->keepalive * HZ;
-		add_timer(&sl->keepalive_timer);
+		timer_add(&sl->keepalive_timer);
 	}
 	if (sl->outfill) {
 		sl->outfill_timer.expires = jiffies + sl->outfill * HZ;
-		add_timer(&sl->outfill_timer);
+		timer_add(&sl->outfill_timer);
 	}
 #endif
 
drivers/net/usb/sierra_net.c +1 -1
index c30ca415d1d3..c0a57917a284 100644
@@ -456,7 +456,7 @@ static void sierra_net_dosync(struct usbnet *dev)
 
 	/* Now, start a timer and make sure we get the Restart Indication */
 	priv->sync_timer.expires = jiffies + SIERRA_NET_SYNCDELAY;
-	add_timer(&priv->sync_timer);
+	timer_add(&priv->sync_timer);
 }
 
 static void sierra_net_kevent(struct work_struct *work)
drivers/net/wan/hdlc_cisco.c +2 -2
index bfc978b15bc2..70e7596e7a95 100644
@@ -260,7 +260,7 @@ static void cisco_timer(struct timer_list *t)
 	spin_unlock(&st->lock);
 
 	st->timer.expires = jiffies + st->settings.interval * HZ;
-	add_timer(&st->timer);
+	timer_add(&st->timer);
 }
 
 static void cisco_start(struct net_device *dev)
@@ -276,7 +276,7 @@ static void cisco_start(struct net_device *dev)
 	st->dev = dev;
 	timer_setup(&st->timer, cisco_timer, 0);
 	st->timer.expires = jiffies + HZ; /* First poll after 1 s */
-	add_timer(&st->timer);
+	timer_add(&st->timer);
 }
 
 static void cisco_stop(struct net_device *dev)
drivers/net/wan/hdlc_fr.c +2 -2
index 08a0ba5ca471..4f500dde54ea 100644
@@ -627,7 +627,7 @@ static void fr_timer(struct timer_list *t)
 			state(hdlc)->settings.t391 * HZ;
 	}
 
-	add_timer(&state(hdlc)->timer);
+	timer_add(&state(hdlc)->timer);
 }
 
 static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
@@ -1012,7 +1012,7 @@ static void fr_start(struct net_device *dev)
 		timer_setup(&state(hdlc)->timer, fr_timer, 0);
 		/* First poll after 1 s */
 		state(hdlc)->timer.expires = jiffies + HZ;
-		add_timer(&state(hdlc)->timer);
+		timer_add(&state(hdlc)->timer);
 	} else {
 		fr_set_link_state(1, dev);
 	}
drivers/net/wan/hdlc_ppp.c +1 -1
index 7496a2e9a282..7889fe51f346 100644
@@ -604,7 +604,7 @@ static void ppp_timer(struct timer_list *t)
 				  ppp->echo_id, 0, NULL);
 			proto->timer.expires = jiffies +
 				ppp->keepalive_interval * HZ;
-			add_timer(&proto->timer);
+			timer_add(&proto->timer);
 		}
 		break;
 	}
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +1 -1
index d40d2823a1e5..82b526b476f0 100644
@@ -2317,7 +2317,7 @@ brcmf_pcie_fwcon_timer(struct brcmf_pciedev_info *devinfo, bool active)
 
 	if (!devinfo->console_active) {
 		devinfo->timer.expires = jiffies + devinfo->console_interval;
-		add_timer(&devinfo->timer);
+		timer_add(&devinfo->timer);
 		devinfo->console_active = true;
 	} else {
 		/* Reschedule the timer */
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -1
index cf26ab15ee0c..bd2e602fd027 100644
@@ -4626,7 +4626,7 @@ void brcmf_sdio_wd_timer(struct brcmf_sdio *bus, bool active)
 			   dynamically changed or in the first instance
 			 */
 			bus->timer.expires = jiffies + BRCMF_WD_POLL;
-			add_timer(&bus->timer);
+			timer_add(&bus->timer);
 			bus->wd_active = true;
 		} else {
 			/* Re arm the timer, at last watchdog period */
drivers/net/wireless/intel/ipw2x00/libipw_crypto.c +2 -2
index 2fe539d5bbf9..018810c6f7ea 100644
@@ -121,7 +121,7 @@ static void libipw_crypt_deinit_handler(struct timer_list *t)
 		printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
 		       "deletion list\n", info->name);
 		info->crypt_deinit_timer.expires = jiffies + HZ;
-		add_timer(&info->crypt_deinit_timer);
+		timer_add(&info->crypt_deinit_timer);
 	}
 	spin_unlock_irqrestore(info->lock, flags);
 }
@@ -147,7 +147,7 @@ void libipw_crypt_delayed_deinit(struct libipw_crypt_info *info,
 		list_add(&tmp->list, &info->crypt_deinit_list);
 		if (!timer_pending(&info->crypt_deinit_timer)) {
 			info->crypt_deinit_timer.expires = jiffies + HZ;
-			add_timer(&info->crypt_deinit_timer);
+			timer_add(&info->crypt_deinit_timer);
 		}
 	}
 	spin_unlock_irqrestore(info->lock, flags);
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -1
index 826c48a2ee69..37b73be38b71 100644
@@ -1467,7 +1467,7 @@ static void mt7921_channel_switch(struct ieee80211_hw *hw,
 	u16 beacon_interval = vif->bss_conf.beacon_int;
 
 	mvif->csa_timer.expires = TU_TO_EXP_TIME(beacon_interval * chsw->count);
-	add_timer(&mvif->csa_timer);
+	timer_add(&mvif->csa_timer);
 }
 
 static void mt7921_abort_channel_switch(struct ieee80211_hw *hw,
drivers/net/wireless/purelifi/plfxlc/usb.c +2 -2
index 1c54cb2906bf..89e6c5dddcc5 100644
@@ -679,12 +679,12 @@ static int probe(struct usb_interface *intf,
 
 	timer_setup(&tx->tx_retry_timer, slif_data_plane_sap_timer_callb, 0);
 	tx->tx_retry_timer.expires = jiffies + TX_RETRY_BACKOFF_JIFF;
-	add_timer(&tx->tx_retry_timer);
+	timer_add(&tx->tx_retry_timer);
 
 	timer_setup(&usb->sta_queue_cleanup,
 		    sta_queue_cleanup_timer_callb, 0);
 	usb->sta_queue_cleanup.expires = jiffies + STA_QUEUE_CLEANUP_JIFF;
-	add_timer(&usb->sta_queue_cleanup);
+	timer_add(&usb->sta_queue_cleanup);
 
 	plfxlc_mac_init_hw(hw);
 	usb->initialized = true;
drivers/net/wireless/rsi/rsi_91x_hal.c +1 -1
index 7d26314a3e76..8ef65e3cf49d 100644
@@ -502,7 +502,7 @@ static int bl_start_cmd_timer(struct rsi_hw *adapter, u32 timeout)
 	adapter->bl_cmd_timer.expires = (msecs_to_jiffies(timeout) + jiffies);
 
 	adapter->blcmd_timer_expired = false;
-	add_timer(&adapter->bl_cmd_timer);
+	timer_add(&adapter->bl_cmd_timer);
 
 	return 0;
 }
drivers/net/wireless/rsi/rsi_91x_mac80211.c +1 -1
index 0e115b428f96..cbee7c947562 100644
@@ -1779,7 +1779,7 @@ static int rsi_mac80211_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 		timer_delete(&common->roc_timer);
 	}
 	common->roc_timer.expires = msecs_to_jiffies(duration) + jiffies;
-	add_timer(&common->roc_timer);
+	timer_add(&common->roc_timer);
 
 	/* Configure band */
 	if (rsi_band_check(common, chan)) {
drivers/pci/hotplug/cpqphp_ctrl.c +2 -2
index 760a5dec0431..a7d3f82b58d6 100644
@@ -1855,8 +1855,8 @@ static void interrupt_event_handler(struct controller *ctrl)
 /*					p_slot->physical_slot = physical_slot; */
 					p_slot->task_event.expires = jiffies + 5 * HZ;   /* 5 second delay */
 
-					dbg("add_timer p_slot = %p\n", p_slot);
-					add_timer(&p_slot->task_event);
+					dbg("timer_add p_slot = %p\n", p_slot);
+					timer_add(&p_slot->task_event);
 				}
 				/***********POWER FAULT */
 				else if (ctrl->event_queue[loop].event_type == INT_POWER_FAULT) {
drivers/pci/hotplug/shpchp_hpc.c +1 -1
index 183bf43510a1..c657a1520c41 100644
@@ -232,7 +232,7 @@ static void start_int_poll_timer(struct controller *ctrl, int sec)
 		sec = 2;
 
 	ctrl->poll_timer.expires = jiffies + sec * HZ;
-	add_timer(&ctrl->poll_timer);
+	timer_add(&ctrl->poll_timer);
 }
 
 static inline int is_ctrl_busy(struct controller *ctrl)
drivers/pcmcia/i82365.c +2 -2
index 1e464b951ed2..f1270c685e77 100644
@@ -879,7 +879,7 @@ static void pcic_interrupt_wrapper(struct timer_list *unused)
 {
     pcic_interrupt(0, NULL);
     poll_timer.expires = jiffies + poll_interval;
-    add_timer(&poll_timer);
+    timer_add(&poll_timer);
 }
 
 /*====================================================================*/
@@ -1291,7 +1291,7 @@ static int __init init_i82365(void)
     if (poll_interval != 0) {
 	timer_setup(&poll_timer, pcic_interrupt_wrapper, 0);
     	poll_timer.expires = jiffies + poll_interval;
-	add_timer(&poll_timer);
+	timer_add(&poll_timer);
     }
     
     return 0;
drivers/pcmcia/tcic.c +1 -1
index 060aed0edc65..a8de893357e8 100644
@@ -572,7 +572,7 @@ static irqreturn_t tcic_interrupt(int irq, void *dev)
     /* Schedule next poll, if needed */
     if (((cs_irq == 0) || quick) && (!tcic_timer_pending)) {
 	poll_timer.expires = jiffies + (quick ? poll_quick : poll_interval);
-	add_timer(&poll_timer);
+	timer_add(&poll_timer);
 	tcic_timer_pending = 1;
     }
     active = 0;
drivers/pcmcia/yenta_socket.c +1 -1
index 372db25c1589..f0145938cae2 100644
@@ -543,7 +543,7 @@ static void yenta_interrupt_wrapper(struct timer_list *t)
 
 	yenta_interrupt(0, (void *)socket);
 	socket->poll_timer.expires = jiffies + HZ;
-	add_timer(&socket->poll_timer);
+	timer_add(&socket->poll_timer);
 }
 
 static void yenta_clear_maps(struct yenta_socket *socket)
drivers/pps/clients/pps-gpio.c +2 -2
index 47d9891de368..2c189602a5c1 100644
@@ -71,7 +71,7 @@ static irqreturn_t pps_gpio_irq_handler(int irq, void *data)
 /* This function will only be called when an ECHO GPIO is defined */
 static void pps_gpio_echo(struct pps_device *pps, int event, void *data)
 {
-	/* add_timer() needs to write into info->echo_timer */
+	/* timer_add() needs to write into info->echo_timer */
 	struct pps_gpio_device_data *info = data;
 
 	switch (event) {
@@ -89,7 +89,7 @@ static void pps_gpio_echo(struct pps_device *pps, int event, void *data)
 	/* fire the timer */
 	if (info->pps->params.mode & (PPS_ECHOASSERT | PPS_ECHOCLEAR)) {
 		info->echo_timer.expires = jiffies + info->echo_timeout;
-		add_timer(&info->echo_timer);
+		timer_add(&info->echo_timer);
 	}
 }
 
drivers/rtc/dev.c +1 -1
index baf1a8ca8b2b..48a44e8efcf5 100644
@@ -61,7 +61,7 @@ static void rtc_uie_task(struct work_struct *work)
 		rtc->uie_timer.expires = jiffies + HZ - (HZ / 10);
 		rtc->uie_timer_active = 1;
 		rtc->uie_task_active = 0;
-		add_timer(&rtc->uie_timer);
+		timer_add(&rtc->uie_timer);
 	} else if (schedule_work(&rtc->uie_task) == 0) {
 		rtc->uie_task_active = 0;
 	}
drivers/rtc/rtc-test.c +2 -2
index 94f995febe5b..e5df794d447f 100644
@@ -53,7 +53,7 @@ static int test_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 	rtd->alarm.expires = expires;
 
 	if (alrm->enabled)
-		add_timer(&rtd->alarm);
+		timer_add(&rtd->alarm);
 
 	rtd->alarm_en = alrm->enabled;
 
@@ -84,7 +84,7 @@ static int test_rtc_alarm_irq_enable(struct device *dev, unsigned int enable)
 
 	rtd->alarm_en = enable;
 	if (enable)
-		add_timer(&rtd->alarm);
+		timer_add(&rtd->alarm);
 	else
 		timer_delete(&rtd->alarm);
 
drivers/s390/char/con3215.c +2 -2
index 56e43d43c713..5a2ca4b9c4f5 100644
@@ -295,7 +295,7 @@ static void raw3215_timeout(struct timer_list *t)
 	    !(raw->flags & RAW3215_WORKING) &&
 	    !(raw->flags & RAW3215_TIMER_RUNS)) {
 		raw->timer.expires = RAW3215_TIMEOUT + jiffies;
-		add_timer(&raw->timer);
+		timer_add(&raw->timer);
 		raw->flags |= RAW3215_TIMER_RUNS;
 	}
 	spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
@@ -324,7 +324,7 @@ static inline void raw3215_try_io(struct raw3215_info *raw)
 	    !(raw->flags & RAW3215_WORKING) &&
 	    !(raw->flags & RAW3215_TIMER_RUNS)) {
 		raw->timer.expires = RAW3215_TIMEOUT + jiffies;
-		add_timer(&raw->timer);
+		timer_add(&raw->timer);
 		raw->flags |= RAW3215_TIMER_RUNS;
 	}
 }
drivers/s390/char/sclp.c +1 -1
index 840be75e75d4..f50a28ee6451 100644
@@ -264,7 +264,7 @@ __sclp_set_request_timer(unsigned long time, void (*cb)(struct timer_list *))
 	timer_delete(&sclp_request_timer);
 	sclp_request_timer.function = cb;
 	sclp_request_timer.expires = jiffies + time;
-	add_timer(&sclp_request_timer);
+	timer_add(&sclp_request_timer);
 }
 
 static void sclp_request_timeout_restart(struct timer_list *unused)
drivers/s390/char/sclp_vt220.c +1 -1
index 62979adcb381..787a61a66a8e 100644
@@ -449,7 +449,7 @@ __sclp_vt220_write(const unsigned char *buf, int count, int do_schedule,
 	if (sclp_vt220_current_request != NULL &&
 	    !timer_pending(&sclp_vt220_timer) && do_schedule) {
 		sclp_vt220_timer.expires = jiffies + BUFFER_MAX_DELAY;
-		add_timer(&sclp_vt220_timer);
+		timer_add(&sclp_vt220_timer);
 	}
 out:
 	spin_unlock_irqrestore(&sclp_vt220_lock, flags);
drivers/s390/char/tape_core.c +1 -1
index fa063e84eafc..900b72094ebc 100644
@@ -1166,7 +1166,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 			device->lb_timeout.expires = jiffies +
 				LONG_BUSY_TIMEOUT * HZ;
 			DBF_EVENT(3, "(%08x): add timer\n", device->cdev_id);
-			add_timer(&device->lb_timeout);
+			timer_add(&device->lb_timeout);
 			request->status = TAPE_REQUEST_LONG_BUSY;
 			break;
 		case TAPE_IO_RETRY:
drivers/s390/net/fsm.c +2 -2
index 6a12d2422540..7d9396359771 100644
@@ -174,7 +174,7 @@ fsm_addtimer(fsm_timer *this, int millisec, int event, void *arg)
 	this->expire_event = event;
 	this->event_arg = arg;
 	this->tl.expires = jiffies + (millisec * HZ) / 1000;
-	add_timer(&this->tl);
+	timer_add(&this->tl);
 	return 0;
 }
 
@@ -193,7 +193,7 @@ fsm_modtimer(fsm_timer *this, int millisec, int event, void *arg)
 	this->expire_event = event;
 	this->event_arg = arg;
 	this->tl.expires = jiffies + (millisec * HZ) / 1000;
-	add_timer(&this->tl);
+	timer_add(&this->tl);
 }
 
 EXPORT_SYMBOL(init_fsm);
drivers/s390/scsi/zfcp_erp.c +1 -1
index ffd994416995..839e8ab4a851 100644
@@ -638,7 +638,7 @@ static void zfcp_erp_strategy_memwait(struct zfcp_erp_action *erp_action)
 {
 	timer_setup(&erp_action->timer, zfcp_erp_memwait_handler, 0);
 	erp_action->timer.expires = jiffies + HZ;
-	add_timer(&erp_action->timer);
+	timer_add(&erp_action->timer);
 }
 
 void zfcp_erp_port_forced_reopen_all(struct zfcp_adapter *adapter,
drivers/s390/scsi/zfcp_fsf.c +2 -2
index c5bba1be88f4..45d8b0334a3d 100644
@@ -49,7 +49,7 @@ static void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req,
 {
 	fsf_req->timer.function = zfcp_fsf_request_timeout_handler;
 	fsf_req->timer.expires = jiffies + timeout;
-	add_timer(&fsf_req->timer);
+	timer_add(&fsf_req->timer);
 }
 
 static void zfcp_fsf_start_erp_timer(struct zfcp_fsf_req *fsf_req)
@@ -57,7 +57,7 @@ static void zfcp_fsf_start_erp_timer(struct zfcp_fsf_req *fsf_req)
 	BUG_ON(!fsf_req->erp_action);
 	fsf_req->timer.function = zfcp_erp_timeout_handler;
 	fsf_req->timer.expires = jiffies + 30 * HZ;
-	add_timer(&fsf_req->timer);
+	timer_add(&fsf_req->timer);
 }
 
 /* association between FSF command and FSF QTCB type */
drivers/scsi/aic7xxx/aic79xx_core.c +1 -1
index 6b87ea004e53..bc95fe8a340e 100644
@@ -6977,7 +6977,7 @@ ahd_timer_reset(struct timer_list *timer, int usec)
 {
 	timer_delete(timer);
 	timer->expires = jiffies + (usec * HZ)/1000000;
-	add_timer(timer);
+	timer_add(timer);
 }
 
 /*
drivers/scsi/aic94xx/aic94xx_hwi.c +1 -1
index e74393357025..1ca6c2b3b482 100644
@@ -1157,7 +1157,7 @@ static void asd_start_scb_timers(struct list_head *list)
 		if (!ascb->uldd_timer) {
 			ascb->timer.function = asd_ascb_timedout;
 			ascb->timer.expires = jiffies + AIC94XX_SCB_TIMEOUT;
-			add_timer(&ascb->timer);
+			timer_add(&ascb->timer);
 		}
 	}
 }
drivers/scsi/aic94xx/aic94xx_tmf.c +1 -1
index 28ac92b041fe..9c54b014b38f 100644
@@ -27,7 +27,7 @@ static int asd_enqueue_internal(struct asd_ascb *ascb,
 	ascb->timer.function = timed_out;
 	ascb->timer.expires = jiffies + AIC94XX_SCB_TIMEOUT;
 
-	add_timer(&ascb->timer);
+	timer_add(&ascb->timer);
 
 	res = asd_post_ascb_list(ascb->ha, ascb, 1);
 	if (unlikely(res))
drivers/scsi/arcmsr/arcmsr_hba.c +2 -2
index 929a3d2f88cd..154d971e5b50 100644
@@ -1039,14 +1039,14 @@ static void arcmsr_init_get_devmap_timer(struct AdapterControlBlock *pacb)
 	pacb->fw_flag = FW_NORMAL;
 	timer_setup(&pacb->eternal_timer, arcmsr_request_device_map, 0);
 	pacb->eternal_timer.expires = jiffies + msecs_to_jiffies(6 * HZ);
-	add_timer(&pacb->eternal_timer);
+	timer_add(&pacb->eternal_timer);
 }
 
 static void arcmsr_init_set_datetime_timer(struct AdapterControlBlock *pacb)
 {
 	timer_setup(&pacb->refresh_timer, arcmsr_set_iop_datetime, 0);
 	pacb->refresh_timer.expires = jiffies + secs_to_jiffies(60);
-	add_timer(&pacb->refresh_timer);
+	timer_add(&pacb->refresh_timer);
 }
 
 static int arcmsr_set_dma_mask(struct AdapterControlBlock *acb)
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -1
index 58da993251e9..55dc01668590 100644
@@ -1929,7 +1929,7 @@ static void bnx2fc_fw_destroy(struct bnx2fc_hba *hba)
 				    0);
 			hba->destroy_timer.expires = BNX2FC_FW_TIMEOUT +
 								jiffies;
-			add_timer(&hba->destroy_timer);
+			timer_add(&hba->destroy_timer);
 			wait_event_interruptible(hba->destroy_wait,
 					test_bit(BNX2FC_FLAG_DESTROY_CMPL,
 						 &hba->flags));
drivers/scsi/bnx2i/bnx2i_iscsi.c +4 -4
index 6c80e5b514fd..e8057afecd57 100644
@@ -1619,7 +1619,7 @@ static int bnx2i_conn_start(struct iscsi_cls_conn *cls_conn)
 	 */
 	timer_setup(&bnx2i_conn->ep->ofld_timer, bnx2i_ep_ofld_timer, 0);
 	bnx2i_conn->ep->ofld_timer.expires = 1 * HZ + jiffies;
-	add_timer(&bnx2i_conn->ep->ofld_timer);
+	timer_add(&bnx2i_conn->ep->ofld_timer);
 	/* update iSCSI context for this conn, wait for CNIC to complete */
 	wait_event_interruptible(bnx2i_conn->ep->ofld_wait,
 			bnx2i_conn->ep->state != EP_STATE_ULP_UPDATE_START);
@@ -1736,7 +1736,7 @@ static int bnx2i_tear_down_conn(struct bnx2i_hba *hba,
 	ep->state = EP_STATE_CLEANUP_START;
 	timer_setup(&ep->ofld_timer, bnx2i_ep_ofld_timer, 0);
 	ep->ofld_timer.expires = hba->conn_ctx_destroy_tmo + jiffies;
-	add_timer(&ep->ofld_timer);
+	timer_add(&ep->ofld_timer);
 
 	bnx2i_ep_destroy_list_add(hba, ep);
 
@@ -1840,7 +1840,7 @@ static struct iscsi_endpoint *bnx2i_ep_connect(struct Scsi_Host *shost,
 
 	timer_setup(&bnx2i_ep->ofld_timer, bnx2i_ep_ofld_timer, 0);
 	bnx2i_ep->ofld_timer.expires = 2 * HZ + jiffies;
-	add_timer(&bnx2i_ep->ofld_timer);
+	timer_add(&bnx2i_ep->ofld_timer);
 
 	if (bnx2i_send_conn_ofld_req(hba, bnx2i_ep)) {
 		if (bnx2i_ep->state == EP_STATE_OFLD_FAILED_CID_BUSY) {
@@ -2057,7 +2057,7 @@ int bnx2i_hw_ep_disconnect(struct bnx2i_endpoint *bnx2i_ep)
 
 	timer_setup(&bnx2i_ep->ofld_timer, bnx2i_ep_ofld_timer, 0);
 	bnx2i_ep->ofld_timer.expires = hba->conn_teardown_tmo + jiffies;
-	add_timer(&bnx2i_ep->ofld_timer);
+	timer_add(&bnx2i_ep->ofld_timer);
 
 	if (!test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic))
 		goto out;
drivers/scsi/dc395x.c +2 -2
index 61bd89b7964d..048ab05a243d 100644
@@ -747,7 +747,7 @@ static void waiting_set_timer(struct AdapterCtlBlk *acb, unsigned long to)
 		    acb->last_reset - HZ / 2 + 1;
 	else
 		acb->waiting_timer.expires = jiffies + to + 1;
-	add_timer(&acb->waiting_timer);
+	timer_add(&acb->waiting_timer);
 }
 
 
@@ -1307,7 +1307,7 @@ static void selto_timer(struct AdapterCtlBlk *acb)
 		    acb->last_reset + HZ / 2 + 1;
 	else
 		acb->selto_timer.expires = jiffies + HZ + 1;
-	add_timer(&acb->selto_timer);
+	timer_add(&acb->selto_timer);
 }
 
 
drivers/scsi/esas2r/esas2r_main.c +1 -1
index 3f31875ff46e..d0ac3e0d5817 100644
@@ -1580,7 +1580,7 @@ void esas2r_kickoff_timer(struct esas2r_adapter *a)
 	a->timer.expires = jiffies +
 			   msecs_to_jiffies(100);
 
-	add_timer(&a->timer);
+	timer_add(&a->timer);
 }
 
 static void esas2r_timer_callback(struct timer_list *t)
drivers/scsi/hisi_sas/hisi_sas_main.c +1 -1
index 894846f0f014..4d5356a87a57 100644
@@ -1017,7 +1017,7 @@ void hisi_sas_phy_oob_ready(struct hisi_hba *hisi_hba, int phy_no)
 			phy->wait_phyup_cnt++;
 			phy->timer.expires = jiffies +
 					     HISI_SAS_WAIT_PHYUP_TIMEOUT;
-			add_timer(&phy->timer);
+			timer_add(&phy->timer);
 			spin_unlock_irqrestore(&phy->lock, flags);
 			return;
 		}
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +1 -1
index 87cff6d7d8d5..945c2d52d10c 100644
@@ -1372,7 +1372,7 @@ static void set_link_timer_quirk(struct hisi_hba *hisi_hba)
 {
 	hisi_hba->timer.function = link_timeout_disable_link;
 	hisi_hba->timer.expires = jiffies + msecs_to_jiffies(1000);
-	add_timer(&hisi_hba->timer);
+	timer_add(&hisi_hba->timer);
 }
 
 static int hw_init_v2_hw(struct hisi_hba *hisi_hba)
drivers/scsi/ibmvscsi/ibmvfc.c +2 -2
index 862ab0fbc893..40d226e8bb2e 100644
@@ -1731,7 +1731,7 @@ static int ibmvfc_send_event(struct ibmvfc_event *evt,
 
 	if (timeout) {
 		evt->timer.expires = jiffies + (timeout * HZ);
-		add_timer(&evt->timer);
+		timer_add(&evt->timer);
 	}
 
 	spin_lock_irqsave(&evt->queue->l_lock, flags);
@@ -4735,7 +4735,7 @@ static void ibmvfc_tgt_adisc(struct ibmvfc_target *tgt)
 		mod_timer(&tgt->timer, jiffies + (IBMVFC_ADISC_TIMEOUT * HZ));
 	else {
 		tgt->timer.expires = jiffies + (IBMVFC_ADISC_TIMEOUT * HZ);
-		add_timer(&tgt->timer);
+		timer_add(&tgt->timer);
 	}
 
 	ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_INIT_WAIT);
drivers/scsi/ibmvscsi/ibmvscsi.c +1 -1
index c9285d1faf23..7620ebf52200 100644
@@ -937,7 +937,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
 	timer_setup(&evt_struct->timer, ibmvscsi_timeout, 0);
 	if (timeout) {
 		evt_struct->timer.expires = jiffies + (timeout * HZ);
-		add_timer(&evt_struct->timer);
+		timer_add(&evt_struct->timer);
 	}
 
 	rc = ibmvscsi_send_crq(hostdata, be64_to_cpu(crq_as_u64[0]),
drivers/scsi/ipr.c +4 -4
index b29bec6abd72..98770758ae4e 100644
@@ -934,7 +934,7 @@ static void ipr_do_req(struct ipr_cmnd *ipr_cmd,
 	ipr_cmd->timer.expires = jiffies + timeout;
 	ipr_cmd->timer.function = timeout_func;
 
-	add_timer(&ipr_cmd->timer);
+	timer_add(&ipr_cmd->timer);
 
 	ipr_trc_hook(ipr_cmd, IPR_TRACE_START, 0);
 
@@ -7514,7 +7514,7 @@ static void ipr_reset_start_timer(struct ipr_cmnd *ipr_cmd,
 
 	ipr_cmd->timer.expires = jiffies + timeout;
 	ipr_cmd->timer.function = ipr_reset_timer_done;
-	add_timer(&ipr_cmd->timer);
+	timer_add(&ipr_cmd->timer);
 }
 
 /**
@@ -7600,7 +7600,7 @@ static int ipr_reset_next_stage(struct ipr_cmnd *ipr_cmd)
 	ipr_cmd->timer.expires = jiffies + stage_time * HZ;
 	ipr_cmd->timer.function = ipr_oper_timeout;
 	ipr_cmd->done = ipr_reset_ioa_job;
-	add_timer(&ipr_cmd->timer);
+	timer_add(&ipr_cmd->timer);
 
 	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_pending_q);
 
@@ -7670,7 +7670,7 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
 	ipr_cmd->timer.expires = jiffies + (ioa_cfg->transop_timeout * HZ);
 	ipr_cmd->timer.function = ipr_oper_timeout;
 	ipr_cmd->done = ipr_reset_ioa_job;
-	add_timer(&ipr_cmd->timer);
+	timer_add(&ipr_cmd->timer);
 	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_pending_q);
 
 	LEAVE;
drivers/scsi/libiscsi.c +1 -1
index 0d441f4cdb5d..bd15c749228d 100644
@@ -1926,7 +1926,7 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,
 	}
 	conn->tmfcmd_pdus_cnt++;
 	session->tmf_timer.expires = timeout * HZ + jiffies;
-	add_timer(&session->tmf_timer);
+	timer_add(&session->tmf_timer);
 	ISCSI_DBG_EH(session, "tmf set timeout\n");
 
 	spin_unlock_bh(&session->frwd_lock);
drivers/scsi/libsas/sas_expander.c +1 -1
index 869b5d4db44c..bc5a6719e685 100644
@@ -84,7 +84,7 @@ static int smp_execute_task_sg(struct domain_device *dev,
 
 		task->slow_task->timer.function = sas_task_internal_timedout;
 		task->slow_task->timer.expires = jiffies + SMP_TIMEOUT*HZ;
-		add_timer(&task->slow_task->timer);
+		timer_add(&task->slow_task->timer);
 
 		res = i->dft->lldd_execute_task(task, GFP_KERNEL);
 
drivers/scsi/libsas/sas_scsi_host.c +2 -2
index 928723c90b75..87487b18f624 100644
@@ -903,7 +903,7 @@ static int sas_execute_internal_abort(struct domain_device *device,
 		task->task_done = sas_task_internal_done;
 		task->slow_task->timer.function = sas_task_internal_timedout;
 		task->slow_task->timer.expires = jiffies + TASK_TIMEOUT;
-		add_timer(&task->slow_task->timer);
+		timer_add(&task->slow_task->timer);
 
 		task->abort_task.tag = tag;
 		task->abort_task.type = type;
@@ -1006,7 +1006,7 @@ int sas_execute_tmf(struct domain_device *device, void *parameter,
 
 		task->slow_task->timer.function = sas_task_internal_timedout;
 		task->slow_task->timer.expires = jiffies + TASK_TIMEOUT;
-		add_timer(&task->slow_task->timer);
+		timer_add(&task->slow_task->timer);
 
 		res = i->dft->lldd_execute_task(task, GFP_KERNEL);
 		if (res) {
drivers/scsi/megaraid/megaraid_mbox.c +1 -1
index ce72cb04a78a..7740daa94313 100644
@@ -3913,7 +3913,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter)
 			     megaraid_sysfs_get_ldmap_timeout, 0);
 
 	timeout.timer.expires		= jiffies + 60 * HZ;
-	add_timer(&timeout.timer);
+	timer_add(&timeout.timer);
 
 	/*
 	 * Send the command to the firmware
drivers/scsi/megaraid/megaraid_mm.c +1 -1
index d3133be36879..38dc22f8c8cd 100644
@@ -694,7 +694,7 @@ lld_ioctl(mraid_mmadp_t *adp, uioc_t *kioc)
 
 		timeout.timer.expires	= jiffies + adp->timeout * HZ;
 
-		add_timer(&timeout.timer);
+		timer_add(&timeout.timer);
 	}
 
 	/*
drivers/scsi/megaraid/megaraid_sas_base.c +1 -1
index e94bf778e83b..3e1a19b199cd 100644
@@ -2335,7 +2335,7 @@ void megasas_start_timer(struct megasas_instance *instance)
 
 	timer_setup(timer, megasas_sriov_heartbeat_handler, 0);
 	timer->expires = jiffies + MEGASAS_SRIOV_HEARTBEAT_INTERVAL_VF;
-	add_timer(timer);
+	timer_add(timer);
 }
 
 static void
drivers/scsi/mvsas/mv_sas.c +1 -1
index 6c46654b9cd9..176ad9c72876 100644
@@ -1821,7 +1821,7 @@ void mvs_int_port(struct mvs_info *mvi, int phy_no, u32 events)
 		if (phy->timer.function == NULL) {
 			phy->timer.function = mvs_sig_time_out;
 			phy->timer.expires = jiffies + 5*HZ;
-			add_timer(&phy->timer);
+			timer_add(&phy->timer);
 		}
 	}
 	if (phy->irq_status & (PHYEV_SIG_FIS | PHYEV_ID_DONE)) {
drivers/scsi/ncr53c8xx.c +1 -1
index 34ba9b137789..629010fae809 100644
@@ -5573,7 +5573,7 @@ static void ncr_timeout (struct ncb *np)
 	}
 
 	np->timer.expires = jiffies + SCSI_NCR_TIMER_INTERVAL;
-	add_timer(&np->timer);
+	timer_add(&np->timer);
 
 	/*
 	**	If we are resetting the ncr, wait for settle_time before 
drivers/scsi/pmcraid.c +6 -6
index 33f403e307eb..67a1ca5168b9 100644
@@ -558,7 +558,7 @@ static void pmcraid_bist_done(struct timer_list *t)
 		pmcraid_info("BIST not complete, waiting another 2 secs\n");
 		cmd->timer.expires = jiffies + cmd->time_left;
 		cmd->time_left = 0;
-		add_timer(&cmd->timer);
+		timer_add(&cmd->timer);
 	} else {
 		cmd->time_left = 0;
 		pmcraid_info("BIST is complete, proceeding with reset\n");
@@ -590,7 +590,7 @@ static void pmcraid_start_bist(struct pmcraid_cmd *cmd)
 	cmd->time_left = msecs_to_jiffies(PMCRAID_BIST_TIMEOUT);
 	cmd->timer.expires = jiffies + msecs_to_jiffies(PMCRAID_BIST_TIMEOUT);
 	cmd->timer.function = pmcraid_bist_done;
-	add_timer(&cmd->timer);
+	timer_add(&cmd->timer);
 }
 
 /**
@@ -622,7 +622,7 @@ static void pmcraid_reset_alert_done(struct timer_list *t)
 		cmd->time_left -= PMCRAID_CHECK_FOR_RESET_TIMEOUT;
 		cmd->timer.expires = jiffies + PMCRAID_CHECK_FOR_RESET_TIMEOUT;
 		cmd->timer.function = pmcraid_reset_alert_done;
-		add_timer(&cmd->timer);
+		timer_add(&cmd->timer);
 	}
 }
 
@@ -659,7 +659,7 @@ static void pmcraid_reset_alert(struct pmcraid_cmd *cmd)
 		cmd->time_left = PMCRAID_RESET_TIMEOUT;
 		cmd->timer.expires = jiffies + PMCRAID_CHECK_FOR_RESET_TIMEOUT;
 		cmd->timer.function = pmcraid_reset_alert_done;
-		add_timer(&cmd->timer);
+		timer_add(&cmd->timer);
 
 		iowrite32(DOORBELL_IOA_RESET_ALERT,
 			pinstance->int_regs.host_ioa_interrupt_reg);
@@ -902,7 +902,7 @@ static void pmcraid_send_cmd(
 		/* setup timeout handler */
 		cmd->timer.expires = jiffies + timeout;
 		cmd->timer.function = timeout_func;
-		add_timer(&cmd->timer);
+		timer_add(&cmd->timer);
 	}
 
 	/* fire the command to IOA */
@@ -1928,7 +1928,7 @@ static void pmcraid_soft_reset(struct pmcraid_cmd *cmd)
 	cmd->timer.function = pmcraid_timeout_handler;
 
 	if (!timer_pending(&cmd->timer))
-		add_timer(&cmd->timer);
+		timer_add(&cmd->timer);
 
 	/* Enable destructive diagnostics on IOA if it is not yet in
 	 * operational state
drivers/scsi/qla2xxx/qla_edif.c +1 -1
index 32e9f7aefecf..822d174b05c2 100644
@@ -1718,7 +1718,7 @@ qla24xx_sadb_update(struct bsg_job *bsg_job)
 		 * This is an activity timer that goes off if we have not
 		 * received packets with the new sa_index
 		 */
-		add_timer(&edif_entry->timer);
+		timer_add(&edif_entry->timer);
 
 		/*
 		 * sa_delete for rx key with an active rx key including this one
drivers/scsi/qla2xxx/qla_iocb.c +1 -1
index 3224044f1775..b6b8530d1bee 100644
@@ -4035,7 +4035,7 @@ qla2x00_start_sp(srb_t *sp)
 		 * kref_put even on failure
 		 */
 		kref_get(&sp->cmd_kref);
-		add_timer(&sp->u.iocb_cmd.timer);
+		timer_add(&sp->u.iocb_cmd.timer);
 	}
 
 	wmb();
drivers/scsi/qla2xxx/qla_os.c +1 -1
index c028a9979e45..5482320ac18b 100644
@@ -381,7 +381,7 @@ qla2x00_start_timer(scsi_qla_host_t *vha, unsigned long interval)
 {
 	timer_setup(&vha->timer, qla2x00_timer, 0);
 	vha->timer.expires = jiffies + interval * HZ;
-	add_timer(&vha->timer);
+	timer_add(&vha->timer);
 	vha->timer_active = 1;
 }
 
drivers/scsi/qla4xxx/ql4_os.c +1 -1
index d4141656b204..94205369321a 100644
@@ -4015,7 +4015,7 @@ static void qla4xxx_start_timer(struct scsi_qla_host *ha,
 		     __func__, ha->host->host_no));
 	timer_setup(&ha->timer, qla4xxx_timer, 0);
 	ha->timer.expires = jiffies + interval * HZ;
-	add_timer(&ha->timer);
+	timer_add(&ha->timer);
 	ha->timer_active = 1;
 }
 
drivers/scsi/smartpqi/smartpqi_init.c +1 -1
index 0042f8e648d0..e1912f5f8528 100644
@@ -3848,7 +3848,7 @@ static void pqi_start_heartbeat_timer(struct pqi_ctrl_info *ctrl_info)
 
 	ctrl_info->heartbeat_timer.expires =
 		jiffies + PQI_HEARTBEAT_TIMER_INTERVAL;
-	add_timer(&ctrl_info->heartbeat_timer);
+	timer_add(&ctrl_info->heartbeat_timer);
 }
 
 static inline void pqi_stop_heartbeat_timer(struct pqi_ctrl_info *ctrl_info)
drivers/scsi/sym53c8xx_2/sym_glue.c +1 -1
index 57637a81776d..a18fea5f5683 100644
@@ -428,7 +428,7 @@ static void sym_timer(struct sym_hcb *np)
 	 *  Restart the timer.
 	 */
 	np->s.timer.expires = thistime + SYM_CONF_TIMER_INTERVAL;
-	add_timer(&np->s.timer);
+	timer_add(&np->s.timer);
 
 	/*
 	 *  If we are resetting the ncr, wait for settle_time before 
drivers/tty/serial/fsl_lpuart.c +1 -1
index 8243f9168f4c..549b355cd8d2 100644
@@ -1710,7 +1710,7 @@ static void rx_dma_timer_init(struct lpuart_port *sport)
 
 	timer_setup(&sport->lpuart_timer, lpuart_timer_func, 0);
 	sport->lpuart_timer.expires = jiffies + sport->dma_rx_timeout;
-	add_timer(&sport->lpuart_timer);
+	timer_add(&sport->lpuart_timer);
 }
 
 static void lpuart_request_dma(struct lpuart_port *sport)
drivers/tty/vcc.c +2 -2
index 2960031ace72..5d9a3ddfd110 100644
@@ -260,7 +260,7 @@ static void vcc_kick_rx(struct vcc_port *port)
 	if (!timer_pending(&port->rx_timer) && !port->removed) {
 		disable_irq_nosync(vio->vdev->rx_irq);
 		port->rx_timer.expires = (jiffies + 1);
-		add_timer(&port->rx_timer);
+		timer_add(&port->rx_timer);
 	}
 }
 
@@ -270,7 +270,7 @@ static void vcc_kick_tx(struct vcc_port *port)
 
 	if (!timer_pending(&port->tx_timer) && !port->removed) {
 		port->tx_timer.expires = (jiffies + 1);
-		add_timer(&port->tx_timer);
+		timer_add(&port->tx_timer);
 	}
 }
 
drivers/usb/chipidea/otg_fsm.c +1 -1
index a093544482d5..c486fef9cfc1 100644
@@ -580,7 +580,7 @@ static struct otg_fsm_ops ci_otg_ops = {
 	.loc_conn = ci_otg_loc_conn,
 	.loc_sof = ci_otg_loc_sof,
 	.start_pulse = ci_otg_start_pulse,
-	.add_timer = ci_otg_fsm_add_timer,
+	.timer_add = ci_otg_fsm_add_timer,
 	.del_timer = ci_otg_fsm_del_timer,
 	.start_host = ci_otg_start_host,
 	.start_gadget = ci_otg_start_gadget,
drivers/usb/gadget/udc/snps_udc_core.c +7 -7
index 373942ceb076..e993b3011fce 100644
@@ -1342,7 +1342,7 @@ udc_set_halt(struct usb_ep *usbep, int halt)
 					/ (1000 * 1000);
 				if (!stop_pollstall_timer) {
 					DBG(ep->dev, "start polltimer\n");
-					add_timer(&udc_pollstall_timer);
+					timer_add(&udc_pollstall_timer);
 				}
 			}
 		}
@@ -1727,7 +1727,7 @@ static void udc_timer_function(struct timer_list *unused)
 			 */
 			udc_timer.expires = jiffies + HZ/UDC_RDE_TIMER_DIV;
 			if (!stop_timer)
-				add_timer(&udc_timer);
+				timer_add(&udc_timer);
 		} else {
 			/*
 			 * fifo contains data now, setup timer for opening
@@ -1740,7 +1740,7 @@ static void udc_timer_function(struct timer_list *unused)
 			/* debug: lhadmot_timer_start = 221070 */
 			udc_timer.expires = jiffies + HZ*UDC_RDE_TIMER_SECONDS;
 			if (!stop_timer)
-				add_timer(&udc_timer);
+				timer_add(&udc_timer);
 		}
 
 	} else
@@ -1807,7 +1807,7 @@ static void udc_pollstall_timer_function(struct timer_list *unused)
 		udc_pollstall_timer.expires = jiffies +
 					HZ * UDC_POLLSTALL_TIMER_USECONDS
 					/ (1000 * 1000);
-		add_timer(&udc_pollstall_timer);
+		timer_add(&udc_pollstall_timer);
 	}
 	spin_unlock_irq(&udc_stall_spinlock);
 
@@ -2045,7 +2045,7 @@ static void udc_ep0_set_rde(struct udc *dev)
 					jiffies + HZ/UDC_RDE_TIMER_DIV;
 				set_rde = 1;
 				if (!stop_timer)
-					add_timer(&udc_timer);
+					timer_add(&udc_timer);
 			}
 		}
 	}
@@ -2234,7 +2234,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
 						+ HZ*UDC_RDE_TIMER_SECONDS;
 					set_rde = 1;
 					if (!stop_timer)
-						add_timer(&udc_timer);
+						timer_add(&udc_timer);
 				}
 				if (ep->num != UDC_EP0OUT_IX)
 					dev->data_ep_queued = 0;
@@ -2513,7 +2513,7 @@ __acquires(dev->lock)
 				udc_timer.expires = jiffies +
 							HZ/UDC_RDE_TIMER_DIV;
 				if (!stop_timer)
-					add_timer(&udc_timer);
+					timer_add(&udc_timer);
 			}
 		}
 
drivers/usb/host/xhci.c +1 -1
index 0244d2854372..172b2ab79557 100644
@@ -423,7 +423,7 @@ static void compliance_mode_recovery_timer_init(struct xhci_hcd *xhci)
 	xhci->comp_mode_recovery_timer.expires = jiffies +
 			msecs_to_jiffies(COMP_MODE_RCVRY_MSECS);
 
-	add_timer(&xhci->comp_mode_recovery_timer);
+	timer_add(&xhci->comp_mode_recovery_timer);
 	xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
 			"Compliance mode recovery timer initialized");
 }
drivers/usb/isp1760/isp1760-hcd.c +2 -2
index 8dcd9cc22413..4803052a9098 100644
@@ -1577,7 +1577,7 @@ static void errata2_function(struct timer_list *unused)
 	spin_unlock_irqrestore(&priv->lock, spinflags);
 
 	errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
-	add_timer(&errata2_timer);
+	timer_add(&errata2_timer);
 }
 
 static int isp1763_run(struct usb_hcd *hcd)
@@ -1712,7 +1712,7 @@ static int isp1760_run(struct usb_hcd *hcd)
 	errata2_timer_hcd = hcd;
 	timer_setup(&errata2_timer, errata2_function, 0);
 	errata2_timer.expires = jiffies + msecs_to_jiffies(SLOT_CHECK_PERIOD);
-	add_timer(&errata2_timer);
+	timer_add(&errata2_timer);
 
 	chipid_h = isp1760_hcd_read(hcd, HC_CHIP_ID_HIGH);
 	chipid_l = isp1760_hcd_read(hcd, HC_CHIP_ID_LOW);
drivers/usb/phy/phy-fsl-usb.c +1 -1
index 40ac68e52cee..17c74f0ac9c8 100644
@@ -762,7 +762,7 @@ static struct otg_fsm_ops fsl_otg_ops = {
 	.loc_sof = fsl_otg_loc_sof,
 	.start_pulse = fsl_otg_start_pulse,
 
-	.add_timer = fsl_otg_fsm_add_timer,
+	.timer_add = fsl_otg_fsm_add_timer,
 	.del_timer = fsl_otg_fsm_del_timer,
 
 	.start_host = fsl_otg_start_host,
drivers/usb/phy/phy-mv-usb.c +1 -1
index 24b8ea50fb86..afc3462e301c 100644
@@ -130,7 +130,7 @@ static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id,
 	}
 
 	timer->expires = jiffies + interval;
-	add_timer(timer);
+	timer_add(timer);
 
 	return 0;
 }
drivers/watchdog/cpwd.c +1 -1
index 13a4d47e68cd..7a1db26b16b3 100644
@@ -252,7 +252,7 @@ static void cpwd_brokentimer(struct timer_list *unused)
 	if (tripped) {
 		/* there is at least one timer brokenstopped-- reschedule */
 		cpwd_timer.expires = WD_BTIMEOUT;
-		add_timer(&cpwd_timer);
+		timer_add(&cpwd_timer);
 	}
 }
 
drivers/xen/grant-table.c +2 -2
index 04a6b470b15d..ebaac810a16d 100644
@@ -544,7 +544,7 @@ static void gnttab_handle_deferred(struct timer_list *unused)
 		WARN_ON(atomic64_read(&deferred_count));
 	else if (!timer_pending(&deferred_timer)) {
 		deferred_timer.expires = jiffies + HZ;
-		add_timer(&deferred_timer);
+		timer_add(&deferred_timer);
 	}
 	spin_unlock_irqrestore(&gnttab_list_lock, flags);
 	pr_debug("Freed %zu references", freed);
@@ -574,7 +574,7 @@ static void gnttab_add_deferred(grant_ref_t ref, struct page *page)
 		list_add_tail(&entry->list, &deferred_list);
 		if (!timer_pending(&deferred_timer)) {
 			deferred_timer.expires = jiffies + HZ;
-			add_timer(&deferred_timer);
+			timer_add(&deferred_timer);
 		}
 		spin_unlock_irqrestore(&gnttab_list_lock, flags);
 		deferred = atomic64_inc_return(&deferred_count);
fs/jbd2/transaction.c +1 -1
index cbc4785462f5..cf6e1e5faa44 100644
@@ -95,7 +95,7 @@ static void jbd2_get_transaction(journal_t *journal,
 
 	/* Set up the commit timer for the new transaction. */
 	journal->j_commit_timer.expires = round_jiffies_up(transaction->t_expires);
-	add_timer(&journal->j_commit_timer);
+	timer_add(&journal->j_commit_timer);
 
 	J_ASSERT(journal->j_running_transaction == NULL);
 	journal->j_running_transaction = transaction;
fs/nilfs2/segment.c +2 -2
index 34a075155965..c3a1ac2c3d14 100644
@@ -2201,7 +2201,7 @@ static void nilfs_segctor_start_timer(struct nilfs_sc_info *sci)
 	if (!(sci->sc_state & NILFS_SEGCTOR_COMMIT)) {
 		if (sci->sc_task) {
 			sci->sc_timer.expires = jiffies + sci->sc_interval;
-			add_timer(&sci->sc_timer);
+			timer_add(&sci->sc_timer);
 		}
 		sci->sc_state |= NILFS_SEGCTOR_COMMIT;
 	}
@@ -2452,7 +2452,7 @@ static void nilfs_segctor_notify(struct nilfs_sc_info *sci, int mode, int err)
 		/* re-enable timer if checkpoint creation was not done */
 		if ((sci->sc_state & NILFS_SEGCTOR_COMMIT) && sci->sc_task &&
 		    time_before(jiffies, sci->sc_timer.expires))
-			add_timer(&sci->sc_timer);
+			timer_add(&sci->sc_timer);
 	}
 	spin_unlock(&sci->sc_state_lock);
 }
include/linux/timer.h +2 -2
index f662aca5d536..899dac465250 100644
@@ -38,7 +38,7 @@
  *
  * @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()
- * has to be used. Enqueue via mod_timer() and add_timer() is always done
+ * has to be used. Enqueue via mod_timer() and timer_add() is always done
  * on the local CPU.
  */
 #define TIMER_CPUMASK		0x0003FFFF
@@ -158,7 +158,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);
  */
 #define NEXT_TIMER_MAX_DELTA	((1UL << 30) - 1)
 
-extern void add_timer(struct timer_list *timer);
+extern void timer_add(struct timer_list *timer);
 extern void timer_add_local(struct timer_list *timer);
 extern void timer_add_global(struct timer_list *timer);
 
include/linux/usb/otg-fsm.h +3 -3
index 6135d076c53d..def298bae8c8 100644
@@ -195,7 +195,7 @@ struct otg_fsm_ops {
 	void	(*start_pulse)(struct otg_fsm *fsm);
 	void	(*start_adp_prb)(struct otg_fsm *fsm);
 	void	(*start_adp_sns)(struct otg_fsm *fsm);
-	void	(*add_timer)(struct otg_fsm *fsm, enum otg_fsm_timer timer);
+	void	(*timer_add)(struct otg_fsm *fsm, enum otg_fsm_timer timer);
 	void	(*del_timer)(struct otg_fsm *fsm, enum otg_fsm_timer timer);
 	int	(*start_host)(struct otg_fsm *fsm, int on);
 	int	(*start_gadget)(struct otg_fsm *fsm, int on);
@@ -279,9 +279,9 @@ static inline int otg_start_adp_sns(struct otg_fsm *fsm)
 
 static inline int otg_add_timer(struct otg_fsm *fsm, enum otg_fsm_timer timer)
 {
-	if (!fsm->ops->add_timer)
+	if (!fsm->ops->timer_add)
 		return -EOPNOTSUPP;
-	fsm->ops->add_timer(fsm, timer);
+	fsm->ops->timer_add(fsm, timer);
 	return 0;
 }
 
kernel/kthread.c +1 -1
index 07370e74ebf1..43f550279758 100644
@@ -1259,7 +1259,7 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker,
 	list_add(&work->node, &worker->delayed_work_list);
 	work->worker = worker;
 	timer->expires = jiffies + delay;
-	add_timer(timer);
+	timer_add(timer);
 }
 
 /**
kernel/rcu/tasks.h +2 -2
index 7982183ef279..d72399187d6d 100644
@@ -1033,7 +1033,7 @@ static void rcu_tasks_postscan(struct list_head *hop)
 
 	if (!IS_ENABLED(CONFIG_TINY_RCU)) {
 		tasks_rcu_exit_srcu_stall_timer.expires = jiffies + rtsi;
-		add_timer(&tasks_rcu_exit_srcu_stall_timer);
+		timer_add(&tasks_rcu_exit_srcu_stall_timer);
 	}
 
 	/*
@@ -1169,7 +1169,7 @@ static void tasks_rcu_exit_srcu_stall(struct timer_list *unused)
 		tasks_gp_state_getname(&rcu_tasks), jiffies - rcu_tasks.gp_jiffies);
 	pr_info("Please check any exiting tasks stuck between calls to exit_tasks_rcu_start() and exit_tasks_rcu_finish()\n");
 	tasks_rcu_exit_srcu_stall_timer.expires = jiffies + rtsi;
-	add_timer(&tasks_rcu_exit_srcu_stall_timer);
+	timer_add(&tasks_rcu_exit_srcu_stall_timer);
 #endif // #ifndef CONFIG_TINY_RCU
 }
 
kernel/time/sleep_timeout.c +1 -1
index 4873eceb85ce..0745d2148150 100644
@@ -95,7 +95,7 @@ signed long __sched schedule_timeout(signed long timeout)
 	timer.task = current;
 	timer_setup_on_stack(&timer.timer, process_timeout, 0);
 	timer.timer.expires = expire;
-	add_timer(&timer.timer);
+	timer_add(&timer.timer);
 	schedule();
 	timer_delete_sync(&timer.timer);
 
kernel/time/timer.c +11 -11
index 74c1383e887f..67fdc84b2a30 100644
@@ -1212,7 +1212,7 @@ EXPORT_SYMBOL(timer_mod_pending);
  *
  * mod_timer(timer, expires) is equivalent to:
  *
- *     timer_delete(timer); timer->expires = expires; add_timer(timer);
+ *     timer_delete(timer); timer->expires = expires; timer_add(timer);
  *
  * mod_timer() is more efficient than the above open coded sequence. In
  * case that the timer is inactive, the timer_delete() part is a NOP. The
@@ -1220,7 +1220,7 @@ EXPORT_SYMBOL(timer_mod_pending);
  *
  * Note that if there are multiple unserialized concurrent users of the
  * same timer, then mod_timer() is the only safe way to modify the timeout,
- * since add_timer() cannot modify an already running timer.
+ * since timer_add() cannot modify an already running timer.
  *
  * If @timer->function == NULL then the start operation is silently
  * discarded. In this case the return value is 0 and meaningless.
@@ -1265,7 +1265,7 @@ int timer_reduce(struct timer_list *timer, unsigned long expires)
 EXPORT_SYMBOL(timer_reduce);
 
 /**
- * add_timer - Start a timer
+ * timer_add - Start a timer
  * @timer:	The timer to be started
  *
  * Start @timer to expire at @timer->expires in the future. @timer->expires
@@ -1284,21 +1284,21 @@ EXPORT_SYMBOL(timer_reduce);
  * This can only operate on an inactive timer. Attempts to invoke this on
  * an active timer are rejected with a warning.
  */
-void add_timer(struct timer_list *timer)
+void timer_add(struct timer_list *timer)
 {
 	if (WARN_ON_ONCE(timer_pending(timer)))
 		return;
 	__mod_timer(timer, timer->expires, MOD_TIMER_NOTPENDING);
 }
-EXPORT_SYMBOL(add_timer);
+EXPORT_SYMBOL(timer_add);
 
 /**
  * timer_add_local() - Start a timer on the local CPU
  * @timer:	The timer to be started
  *
- * Same as add_timer() except that the timer flag TIMER_PINNED is set.
+ * Same as timer_add() except that the timer flag TIMER_PINNED is set.
  *
- * See add_timer() for further details.
+ * See timer_add() for further details.
  */
 void timer_add_local(struct timer_list *timer)
 {
@@ -1313,9 +1313,9 @@ EXPORT_SYMBOL(timer_add_local);
  * timer_add_global() - Start a timer without TIMER_PINNED flag set
  * @timer:	The timer to be started
  *
- * Same as add_timer() except that the timer flag TIMER_PINNED is unset.
+ * Same as timer_add() except that the timer flag TIMER_PINNED is unset.
  *
- * See add_timer() for further details.
+ * See timer_add() for further details.
  */
 void timer_add_global(struct timer_list *timer)
 {
@@ -1331,12 +1331,12 @@ EXPORT_SYMBOL(timer_add_global);
  * @timer:	The timer to be started
  * @cpu:	The CPU to start it on
  *
- * Same as add_timer() except that it starts the timer on the given CPU and
+ * Same as timer_add() except that it starts the timer on the given CPU and
  * the TIMER_PINNED flag is set. When timer shouldn't be a pinned timer in
  * the next round, timer_add_global() should be used instead as it unsets
  * the TIMER_PINNED flag.
  *
- * See add_timer() for further details.
+ * See timer_add() for further details.
  */
 void add_timer_on(struct timer_list *timer, int cpu)
 {
mm/oom_kill.c +1 -1
index 25923cfec9c6..eafc120eb405 100644
@@ -701,7 +701,7 @@ static void queue_oom_reaper(struct task_struct *tsk)
 	get_task_struct(tsk);
 	timer_setup(&tsk->oom_reaper_timer, wake_oom_reaper, 0);
 	tsk->oom_reaper_timer.expires = jiffies + OOM_REAPER_DELAY;
-	add_timer(&tsk->oom_reaper_timer);
+	timer_add(&tsk->oom_reaper_timer);
 }
 
 #ifdef CONFIG_SYSCTL
net/appletalk/aarp.c +1 -1
index 9c787e2e4b17..43d9bca10b73 100644
@@ -853,7 +853,7 @@ int __init aarp_proto_init(void)
 	}
 	timer_setup(&aarp_timer, aarp_expire_timeout, 0);
 	aarp_timer.expires  = jiffies + sysctl_aarp_expiry_time;
-	add_timer(&aarp_timer);
+	timer_add(&aarp_timer);
 	rc = register_netdevice_notifier(&aarp_notifier);
 	if (rc) {
 		timer_delete_sync(&aarp_timer);
net/appletalk/ddp.c +2 -2
index 73ea7e67f05a..47d876f46422 100644
@@ -173,7 +173,7 @@ static void atalk_destroy_timer(struct timer_list *t)
 
 	if (sk_has_allocations(sk)) {
 		sk->sk_timer.expires = jiffies + SOCK_DESTROY_TIME;
-		add_timer(&sk->sk_timer);
+		timer_add(&sk->sk_timer);
 	} else
 		sock_put(sk);
 }
@@ -186,7 +186,7 @@ static inline void atalk_destroy_socket(struct sock *sk)
 	if (sk_has_allocations(sk)) {
 		timer_setup(&sk->sk_timer, atalk_destroy_timer, 0);
 		sk->sk_timer.expires	= jiffies + SOCK_DESTROY_TIME;
-		add_timer(&sk->sk_timer);
+		timer_add(&sk->sk_timer);
 	} else
 		sock_put(sk);
 }
net/atm/lec.c +3 -3
index 97c6a1b9ca89..ca452b2982c2 100644
@@ -1778,7 +1778,7 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
 			send_to_lecd(priv, l_arp_xmt, mac_to_find, NULL, NULL);
 		entry->timer.expires = jiffies + (1 * HZ);
 		entry->timer.function = lec_arp_expire_arp;
-		add_timer(&entry->timer);
+		timer_add(&entry->timer);
 		found = priv->mcast_vcc;
 	}
 
@@ -1970,7 +1970,7 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
 		entry->timer.expires = jiffies + priv->vcc_timeout_period;
 		entry->timer.function = lec_arp_expire_vcc;
 		hlist_add_head(&entry->next, &priv->lec_no_forward);
-		add_timer(&entry->timer);
+		timer_add(&entry->timer);
 		dump_arp_table(priv);
 		goto out;
 	}
@@ -2044,7 +2044,7 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
 	hlist_add_head(&entry->next, &priv->lec_arp_empty_ones);
 	entry->timer.expires = jiffies + priv->vcc_timeout_period;
 	entry->timer.function = lec_arp_expire_vcc;
-	add_timer(&entry->timer);
+	timer_add(&entry->timer);
 	pr_debug("After vcc was added\n");
 	dump_arp_table(priv);
 out:
net/atm/mpc.c +1 -1
index f6b447bba329..6b0c98a71329 100644
@@ -1416,7 +1416,7 @@ static void mpc_timer_refresh(void)
 {
 	mpc_timer.expires = jiffies + (MPC_P2 * HZ);
 	checking_time = mpc_timer.expires;
-	add_timer(&mpc_timer);
+	timer_add(&mpc_timer);
 }
 
 static void mpc_cache_check(struct timer_list *unused)
net/ax25/af_ax25.c +1 -1
index 6ef8b2a57a9b..4dc6c5f2e0b1 100644
@@ -345,7 +345,7 @@ void ax25_destroy_socket(ax25_cb *ax25)
 			/* Defer: outstanding buffers */
 			timer_setup(&ax25->dtimer, ax25_destroy_timer, 0);
 			ax25->dtimer.expires  = jiffies + 2 * HZ;
-			add_timer(&ax25->dtimer);
+			timer_add(&ax25->dtimer);
 		} else {
 			struct sock *sk=ax25->sk;
 			ax25->sk=NULL;
net/core/drop_monitor.c +2 -2
index 60d31c2feed3..046764ec42de 100644
@@ -256,7 +256,7 @@ static void trace_drop_common(struct sk_buff *skb, void *location)
 
 	if (!timer_pending(&data->send_timer)) {
 		data->send_timer.expires = jiffies + dm_delay * HZ;
-		add_timer(&data->send_timer);
+		timer_add(&data->send_timer);
 	}
 
 out:
@@ -475,7 +475,7 @@ net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink,
 
 	if (!timer_pending(&hw_data->send_timer)) {
 		hw_data->send_timer.expires = jiffies + dm_delay * HZ;
-		add_timer(&hw_data->send_timer);
+		timer_add(&hw_data->send_timer);
 	}
 
 out:
net/ipv4/igmp.c +1 -1
index d1769034b643..ab1084be3ce7 100644
@@ -253,7 +253,7 @@ static void igmp_mod_timer(struct ip_mc_list *im, int max_delay)
 	im->unsolicit_count = 0;
 	if (timer_delete(&im->timer)) {
 		if ((long)(im->timer.expires-jiffies) < max_delay) {
-			add_timer(&im->timer);
+			timer_add(&im->timer);
 			im->tm_running = 1;
 			spin_unlock_bh(&im->lock);
 			return;
net/lapb/lapb_timer.c +2 -2
index 9fde6cf20f10..03269d53efe5 100644
@@ -41,7 +41,7 @@ void lapb_start_t1timer(struct lapb_cb *lapb)
 	lapb->t1timer.expires  = jiffies + lapb->t1;
 
 	lapb->t1timer_running = true;
-	add_timer(&lapb->t1timer);
+	timer_add(&lapb->t1timer);
 }
 
 void lapb_start_t2timer(struct lapb_cb *lapb)
@@ -52,7 +52,7 @@ void lapb_start_t2timer(struct lapb_cb *lapb)
 	lapb->t2timer.expires  = jiffies + lapb->t2;
 
 	lapb->t2timer_running = true;
-	add_timer(&lapb->t2timer);
+	timer_add(&lapb->t2timer);
 }
 
 void lapb_stop_t1timer(struct lapb_cb *lapb)
net/mptcp/pm.c +10 -10
index 2475b3975813..14c1123039b4 100644
@@ -16,7 +16,7 @@ struct mptcp_pm_add_entry {
 	struct list_head	list;
 	struct mptcp_addr_info	addr;
 	u8			retrans_times;
-	struct timer_list	add_timer;
+	struct timer_list	timer_add;
 	struct mptcp_sock	*sock;
 };
 
@@ -267,7 +267,7 @@ int mptcp_pm_mp_prio_send_ack(struct mptcp_sock *msk,
 
 static void mptcp_pm_add_timer(struct timer_list *timer)
 {
-	struct mptcp_pm_add_entry *entry = timer_container_of(entry, timer, add_timer);
+	struct mptcp_pm_add_entry *entry = timer_container_of(entry, timer, timer_add);
 	struct mptcp_sock *msk = entry->sock;
 	struct sock *sk = (struct sock *)msk;
 
@@ -315,21 +315,21 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
 {
 	struct mptcp_pm_add_entry *entry;
 	struct sock *sk = (struct sock *)msk;
-	struct timer_list *add_timer = NULL;
+	struct timer_list *timer_add = NULL;
 
 	spin_lock_bh(&msk->pm.lock);
[… more lines in the raw message]

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

net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
index 798c7993635e..b6be18037f30 100644

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

net/netfilter/ipset/ip_set_list_set.c +1 -1
index 13c7a08aa868..dc45021a784a 100644

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

net/netfilter/nf_conntrack_expect.c +1 -1
index cfc2daa3fc7f..a71ee3d36bb9 100644

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

net/netfilter/nf_conntrack_netlink.c +1 -1
index 2cc0fde23344..1446c1bfa5cd 100644

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

net/netfilter/nfnetlink_log.c +1 -1
index bfcb9cd335bf..494d9426ba9e 100644

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

net/netrom/af_netrom.c +1 -1
index 3331669d8e33..8a33d8ba24ed 100644

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

net/rose/af_rose.c +1 -1
index 4e72b636a46a..0d98387cf547 100644

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

net/rose/rose_link.c +2 -2
index 7746229fdc8c..d9f5d3f76223 100644

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

net/sctp/sm_sideeffect.c +1 -1
index 6c24ac6d3bf1..d16c244fc451 100644

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

net/x25/af_x25.c +1 -1
index 1f8ae9f4a3f1..f51c249efb39 100644

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

samples/ftrace/sample-trace-array.c +1 -1
index dac67c367457..0e0e0628cead 100644

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

sound/pci/asihpi/asihpi.c +1 -1
index 0fcb416c26cb..3fba8f3a90ec 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.

#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