timers: Simple cleanup of the timer API namespace
Subsystems (339)
cover timers: Simple cleanup of the timer API namespace
[ Changes since -v1:
- Exclude the 6 APIs that need further work, keep 9 APIs/symbols
- timer_init_on_stack_key() -> timer_init_key_on_stack()
- Fixes
- Rebase to -rc2
]
Continue 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>:
from_timer() => timer_container_of()
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()
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_key_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.
Note that as per the -v1 discussion with Thomas Gleixner, the following APIs can also be enhanced semantically and their uses further cleaned up and simplified with Coccinelle, so keep them unmodified in the old namespace:
mod_timer_pending()
mod_timer()
add_timer_global()
add_timer_local()
add_timer()
add_timer_on()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 (10):
rust: Rename timer_container_of() to hrtimer_container_of() treewide, timers: Rename from_timer() => timer_container_of() treewide, timers: Rename try_to_del_timer_sync() => timer_delete_sync_try() 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_key_on_stack() 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()
arch/alpha/kernel/srmcons.c | 2 +- arch/powerpc/kvm/booke.c | 10 ++--- 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/kernel/apic/vector.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 | 4 +- 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/random.c | 6 +-- 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 | 4 +- drivers/dma/imx-dma.c | 2 +- drivers/dma/ioat/dma.c | 2 +- drivers/firewire/core-transaction.c | 4 +- drivers/firmware/psci/psci_checker.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 2 +- drivers/gpu/drm/bridge/tda998x_drv.c | 2 +- drivers/gpu/drm/drm_vblank.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +- drivers/gpu/drm/gud/gud_pipe.c | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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/irqchip/irq-riscv-imsic-state.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 | 12 +++--- 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/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 | 4 +- drivers/scsi/megaraid/megaraid_mm.c | 4 +- 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 | 4 +- 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_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/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 | 4 +- 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 | 4 +- 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/bcachefs/clock.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 | 42 ++++++++++----------- include/linux/workqueue.h | 4 +- init/main.c | 2 +- kernel/kcsan/kcsan_test.c | 2 +- kernel/kthread.c | 2 +- kernel/rcu/rcutorture.c | 2 +- kernel/rcu/tasks.h | 2 +- kernel/rcu/tree_nocb.h | 2 +- kernel/sched/psi.c | 2 +- kernel/time/sleep_timeout.c | 4 +- kernel/time/timer.c | 36 +++++++++--------- kernel/workqueue.c | 8 ++-- 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 | 44 +++++++++++----------- 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_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 +- 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 +- 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 | 4 +- 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 +- 708 files changed, 997 insertions(+), 997 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/10 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.
--- 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH 2/10 treewide, timers: Rename from_timer() => timer_container_of()
In reply to Ingo MolnarMove 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 +- 697 files changed, 923 insertions(+), 923 deletions(-)
arch/alpha/kernel/srmcons.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -129,7 +129,7 @@ static void qaic_timesync_dl_xfer_cb(struct mhi_device *mhi_dev, struct mhi_resustatic 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5548,7 +5548,7 @@ static void handle_cce_err(struct hfi1_devdata *dd, u32 unused, u64 reg)#define RCVERR_CHECK_TIME 10static 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -64,7 +64,7 @@ static int __led_set_brightness_blocking(struct led_classdev *led_cdev, unsignedstatic 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/smsc/smc91c92_cs.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/sun/sunvnet_common.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/tundra/tsi108_eth.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ar5523/ar5523.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath10k/htt_rx.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath11k/dp_rx.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath12k/dp_rx.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath6kl/recovery.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/channel.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/wil6210/netdev.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/ipw2x00/libipw_crypto.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlegacy/3945-rs.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlegacy/4965-mac.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlegacy/common.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/dvm/main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/dvm/tt.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/mld/agg.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/pcie/tx.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/libertas/if_usb.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/libertas/main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/libertas_tf/if_usb.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/libertas_tf/main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/cmdevt.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/init.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/tdls.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/usb.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt7615/main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt792x_core.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/microchip/wilc1000/hif.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/wireless/purelifi/plfxlc/usb.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/base.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw88/tx.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rsi/rsi_91x_mac80211.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/scsi/megaraid/megaraid_sas_base.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/gpib/agilent_82357a/agilent_82357a.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/gpib/ni_usb/ni_usb_gpib.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/imx/imx-ic-prpencvf.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/imx/imx-media-csi.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/core/rtw_cmd.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/core/rtw_recv.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/os_dep/mlme_linux.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/target/iscsi/iscsi_target_erl0.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/target/iscsi/iscsi_target_erl1.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/target/iscsi/iscsi_target_util.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/tty/serial/8250/8250_aspeed_vuart.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/virt/vboxguest/vboxguest_core.c +1 -1
Lines of this file are not shown. View the raw message.
net/ipv6/netfilter/nf_conntrack_reasm.c +1 -1
Lines of this file are not shown. View the raw message.
net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
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.
PATCH 3/10 treewide, timers: Rename try_to_del_timer_sync() => timer_delete_sync_try()
In reply to Ingo MolnarMove 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
@@ -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
@@ -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
@@ -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
@@ -162,7 +162,7 @@ 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 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
@@ -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
@@ -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
@@ -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
PATCH 4/10 treewide, timers: Rename destroy_timer_on_stack() => timer_destroy_on_stack()
In reply to Ingo MolnarMove this API to the canonical timer_*() namespace.
--- drivers/base/power/main.c | 2 +- drivers/char/random.c | 2 +- drivers/dma-buf/st-dma-fence.c | 2 +- drivers/firewire/core-transaction.c | 2 +- drivers/firmware/psci/psci_checker.c | 2 +- drivers/gpu/drm/gud/gud_pipe.c | 2 +- drivers/gpu/drm/i915/gt/selftest_migrate.c | 2 +- drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 2 +- drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +- drivers/misc/sgi-xp/xpc_partition.c | 4 ++-- drivers/scsi/megaraid/megaraid_mbox.c | 2 +- drivers/scsi/megaraid/megaraid_mm.c | 2 +- drivers/staging/gpib/common/iblib.c | 2 +- drivers/staging/rtl8723bs/core/rtw_cmd.c | 8 ++++---- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/misc/usbtest.c | 2 +- fs/bcachefs/clock.c | 2 +- include/linux/timer.h | 6 +++--- kernel/kcsan/kcsan_test.c | 2 +- kernel/rcu/rcutorture.c | 2 +- kernel/time/sleep_timeout.c | 2 +- kernel/time/timer.c | 4 ++-- kernel/workqueue.c | 2 +- net/ipv4/inet_connection_sock.c | 6 +++--- 26 files changed, 35 insertions(+), 35 deletions(-)
drivers/base/power/main.c +1 -1
@@ -560,7 +560,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd)struct timer_list *timer = &wd->timer;timer_delete_sync (timer); - destroy_timer_on_stack(timer); + timer_destroy_on_stack(timer); }#else #define DECLARE_DPM_WATCHDOG_ON_STACK (wd)
drivers/char/random.c +1 -1
@@ -1353,7 +1353,7 @@ static void __cold try_to_generate_entropy(void)mix_pool_bytes (&stack->entropy,sizeof (stack->entropy));timer_delete_sync (&stack->timer); -destroy_timer_on_stack (&stack->timer); +timer_destroy_on_stack (&stack->timer); }
drivers/dma-buf/st-dma-fence.c +1 -1
@@ -413,7 +413,7 @@ static int test_wait_timeout(void *arg) err =0 ; err_free:timer_delete_sync (&wt.timer); -destroy_timer_on_stack (&wt.timer); +timer_destroy_on_stack (&wt.timer);dma_fence_signal (wt.f);dma_fence_put (wt.f);return err;
drivers/firewire/core-transaction.c +1 -1
@@ -431,7 +431,7 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,fw_send_request (card, &t, tcode, destination_id, generation, speed, offset, payload, length, transaction_callback, &d);wait_for_completion (&d.done); -destroy_timer_on_stack (&t.split_timeout_timer); +timer_destroy_on_stack (&t.split_timeout_timer);return d.rcode; }
drivers/firmware/psci/psci_checker.c +1 -1
@@ -343,7 +343,7 @@ static int suspend_test_thread(void *arg)* later. */ timer_delete (&wakeup_timer); -destroy_timer_on_stack (&wakeup_timer); +timer_destroy_on_stack (&wakeup_timer);if (atomic_dec_return_relaxed (&nb_active_threads) ==0 )complete (&suspend_threads_done);
drivers/gpu/drm/gud/gud_pipe.c +1 -1
@@ -261,7 +261,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)else if (ctx.sgr.bytes != len) ret = -EIO ; -destroy_timer_on_stack (&ctx.timer); +timer_destroy_on_stack (&ctx.timer);return ret; }
drivers/gpu/drm/i915/gt/selftest_migrate.c +1 -1
@@ -661,7 +661,7 @@ static int live_emit_pte_full_ring(void *arg) out_rq:i915_request_add (rq);/* GEM_BUG_ON(rq->reserved_space > ring->space)? */ timer_delete_sync (&st.timer); -destroy_timer_on_stack (&st.timer); +timer_destroy_on_stack (&st.timer); out_unpin:intel_context_unpin (ce); out_put:
drivers/gpu/drm/i915/selftests/lib_sw_fence.c +1 -1
@@ -77,7 +77,7 @@ void timed_fence_fini(struct timed_fence *tf)if (timer_delete_sync (&tf->timer))i915_sw_fence_commit (&tf->fence); -destroy_timer_on_stack (&tf->timer); +timer_destroy_on_stack (&tf->timer);i915_sw_fence_fini (&tf->fence); }
drivers/gpu/drm/ttm/tests/ttm_bo_test.c +1 -1
@@ -201,7 +201,7 @@ static int threaded_ttm_bo_reserve(void *arg) err =ttm_bo_reserve (bo, interruptible, no_wait, &ctx);timer_delete_sync (&s_timer.timer); -destroy_timer_on_stack (&s_timer.timer); +timer_destroy_on_stack (&s_timer.timer);ww_acquire_fini (&ctx);
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +1 -1
@@ -3806,7 +3806,7 @@ status);if ((status <0 ) && (!probe_fl)) {pvr2_hdw_render_useless (hdw); } -destroy_timer_on_stack (&timer.timer); +timer_destroy_on_stack (&timer.timer);return status; }
drivers/misc/sgi-xp/xpc_partition.c +2 -2
@@ -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 timer_container_of) +bool from_timer) {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 (!timer_container_of) +if (!from_timer)timer_delete_sync (&part->disengage_timer); DBUG_ON(part->act_state != XPC_P_AS_DEACTIVATING &&
drivers/scsi/megaraid/megaraid_mbox.c +1 -1
@@ -3952,7 +3952,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter)timer_delete_sync (&timeout.timer); -destroy_timer_on_stack (&timeout.timer); +timer_destroy_on_stack (&timeout.timer);mutex_unlock (&raid_dev->sysfs_mtx);
drivers/scsi/megaraid/megaraid_mm.c +1 -1
@@ -704,7 +704,7 @@ lld_ioctl(mraid_mmadp_t *adp, uioc_t *kioc)wait_event (wait_q, (kioc->status != -ENODATA ));if (timeout.timer.function) {timer_delete_sync (&timeout.timer); -destroy_timer_on_stack (&timeout.timer); +timer_destroy_on_stack (&timeout.timer); }/*
drivers/staging/gpib/common/iblib.c +1 -1
@@ -611,7 +611,7 @@ static void start_wait_timer(struct wait_info *winfo)static void remove_wait_timer (struct wait_info *winfo) {timer_delete_sync (&winfo->timer); -destroy_timer_on_stack (&winfo->timer); +timer_destroy_on_stack (&winfo->timer); }/*
drivers/staging/rtl8723bs/core/rtw_cmd.c +4 -4
@@ -1130,7 +1130,7 @@ static void collect_traffic_statistics(struct adapter *padapter) pdvobjpriv->traffic_stat.cur_rx_tp = (u32)(pdvobjpriv->traffic_stat.cur_rx_bytes *8 /2 /1024 /1024 ); } -u8 traffic_status_watchdog (struct adapter *padapter,u8 timer_container_of) +u8 traffic_status_watchdog (struct adapter *padapter,u8 from_timer) {u8 bEnterPS = false;u16 BusyThresholdHigh =25 ;
@@ -1198,10 +1198,10 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 timer_container_of)/* LeisurePS only work in infra mode. */ if (bEnterPS) { -if (!timer_container_of) +if (!from_timer)LPS_Enter (padapter,"TRAFFIC_IDLE" ); }else { -if (!timer_container_of) +if (!from_timer)LPS_Leave (padapter,"TRAFFIC_BUSY" );else rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_TRAFFIC_BUSY ,1 );
@@ -1213,7 +1213,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 timer_container_of)if (check_fwstate (&dvobj->padapters->mlmepriv,WIFI_ASOC_STATE )) n_assoc_iface++; -if (!timer_container_of && n_assoc_iface ==0 ) +if (!from_timer && n_assoc_iface ==0 )LPS_Leave (padapter,"NON_LINKED" ); }
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
@@ -617,7 +617,7 @@ extern void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addrextern void update_TSF (struct mlme_ext_priv *pmlmeext,u8 *pframe,uint len);extern void correct_TSF (struct adapter *padapter,struct mlme_ext_priv *pmlmeext);extern void adaptive_early_32k (struct mlme_ext_priv *pmlmeext,u8 *pframe,uint len); -extern u8 traffic_status_watchdog (struct adapter *padapter,u8 timer_container_of); +extern u8 traffic_status_watchdog (struct adapter *padapter,u8 from_timer);int rtw_chk_start_clnt_join (struct adapter *padapter,u8 *ch,u8 *bw,u8 *offset);
drivers/usb/atm/cxacru.c +1 -1
@@ -598,7 +598,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,mod_timer (&timer.timer, jiffies +msecs_to_jiffies (CMD_TIMEOUT ));wait_for_completion (done);timer_delete_sync (&timer.timer); -destroy_timer_on_stack (&timer.timer); +timer_destroy_on_stack (&timer.timer);if (actual_length) *actual_length = urb->actual_length;
drivers/usb/misc/usbtest.c +1 -1
@@ -630,7 +630,7 @@ static int perform_sglist( retval = -ETIMEDOUT ; else retval = req->status; -destroy_timer_on_stack (&timeout.timer); +timer_destroy_on_stack (&timeout.timer);/* FIXME check resulting data pattern */
fs/bcachefs/clock.c +1 -1
@@ -122,7 +122,7 @@ void bch2_kthread_io_clock_wait(struct io_clock *clock,__set_current_state (TASK_RUNNING );timer_delete_sync (&wait.cpu_timer); -destroy_timer_on_stack (&wait.cpu_timer); +timer_destroy_on_stack (&wait.cpu_timer);bch2_io_timer_del (clock, &wait.io_timer); }
include/linux/timer.h +3 -3
@@ -115,7 +115,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,* * Regular timer initialization should use either DEFINE_TIMER() above, * or timer_setup(). For timers on the stack, timer_setup_on_stack() must -* be used and must be balanced with a call to destroy_timer_on_stack(). +* be used and must be balanced with a call to timer_destroy_on_stack(). */ #define timer_setup (timer, callback, flags) \ __init_timer((timer), (callback), (flags))
@@ -124,9 +124,9 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, __init_timer_on_stack((timer), (callback), (flags))#ifdef CONFIG_DEBUG_OBJECTS_TIMERS -extern void destroy_timer_on_stack (struct timer_list *timer); +extern void timer_destroy_on_stack (struct timer_list *timer);#else -static inline void destroy_timer_on_stack (struct timer_list *timer) { } +static inline void timer_destroy_on_stack (struct timer_list *timer) { }#endif #define timer_container_of (var, callback_timer, timer_fieldname) \
kernel/kcsan/kcsan_test.c +1 -1
@@ -1501,7 +1501,7 @@ static int access_thread(void *arg) } }while (!torture_must_stop ());timer_delete_sync (&timer); -destroy_timer_on_stack (&timer); +timer_destroy_on_stack (&timer);torture_kthread_stopping ("access_thread" );return 0 ;
kernel/rcu/rcutorture.c +1 -1
@@ -2325,7 +2325,7 @@ rcu_torture_reader(void *arg) }while (!torture_must_stop ());if (irqreader && cur_ops->irq_capable) {timer_delete_sync (&t); -destroy_timer_on_stack (&t); +timer_destroy_on_stack (&t); }tick_dep_clear_task (current,TICK_DEP_BIT_RCU );torture_kthread_stopping ("rcu_torture_reader" );
kernel/time/sleep_timeout.c +1 -1
@@ -100,7 +100,7 @@ signed long __sched schedule_timeout(signed long timeout)timer_delete_sync (&timer.timer);/* Remove the timer from the object tracker */ -destroy_timer_on_stack (&timer.timer); +timer_destroy_on_stack (&timer.timer); timeout = expire - jiffies;
kernel/time/timer.c +2 -2
@@ -860,11 +860,11 @@ void init_timer_on_stack_key(struct timer_list *timer, }EXPORT_SYMBOL_GPL (init_timer_on_stack_key); -void destroy_timer_on_stack (struct timer_list *timer) +void timer_destroy_on_stack (struct timer_list *timer) {debug_object_free (timer, &timer_debug_descr); } -EXPORT_SYMBOL_GPL (destroy_timer_on_stack); +EXPORT_SYMBOL_GPL (timer_destroy_on_stack);#else static inline void debug_timer_init (struct timer_list *timer) { }
kernel/workqueue.c +1 -1
@@ -686,7 +686,7 @@ EXPORT_SYMBOL_GPL(destroy_work_on_stack);void destroy_delayed_work_on_stack (struct delayed_work *work) { -destroy_timer_on_stack (&work->timer); +timer_destroy_on_stack (&work->timer);debug_object_free (&work->work, &work_debug_descr); }EXPORT_SYMBOL_GPL (destroy_delayed_work_on_stack);
net/ipv4/inet_connection_sock.c +3 -3
@@ -1039,11 +1039,11 @@ static bool reqsk_queue_unlink(struct request_sock *req)static bool __inet_csk_reqsk_queue_drop (struct sock *sk,struct request_sock *req, -bool timer_container_of) +bool from_timer) {bool unlinked =reqsk_queue_unlink (req); -if (!timer_container_of &&timer_delete_sync (&req->rsk_timer)) +if (!from_timer &&timer_delete_sync (&req->rsk_timer))reqsk_put (req);if (unlinked) {
@@ -1069,7 +1069,7 @@ EXPORT_SYMBOL(inet_csk_reqsk_queue_drop_and_put);static void reqsk_timer_handler (struct timer_list *t) { -struct request_sock *req =timer_container_of (req, t, rsk_timer); +struct request_sock *req =from_timer (req, t, rsk_timer);struct request_sock *nreq =NULL , *oreq = req;struct sock *sk_listener = req->rsk_listener;struct inet_connection_sock *icsk;
Signature · 1 line
2.45.2
PATCH 5/10 treewide, timers: Rename init_timer_key() => timer_init_key()
In reply to Ingo MolnarMove this API to the canonical timer_*() namespace.
--- include/linux/timer.h | 8 ++++---- kernel/time/timer.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
include/linux/timer.h +4 -4
@@ -67,7 +67,7 @@/* * LOCKDEP and DEBUG timer interfaces. */ -void init_timer_key (struct timer_list *timer, +void timer_init_key (struct timer_list *timer,void (*func)(struct timer_list *),unsigned int flags,const char *name,struct lock_class_key *key);
@@ -83,7 +83,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,const char *name, struct lock_class_key *key) { -init_timer_key (timer ,func ,flags ,name ,key ); +timer_init_key (timer ,func ,flags ,name ,key ); }#endif
@@ -91,7 +91,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,#define __init_timer (_timer, _fn, _flags) \ do { \ static struct lock_class_key __key; \ - init_timer_key((_timer), (_fn), (_flags), #_timer, &__key);\ + timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\ } while (0)#define __init_timer_on_stack (_timer, _fn, _flags) \
@@ -102,7 +102,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, } while (0)#else #define __init_timer (_timer, _fn, _flags) \ - init_timer_key((_timer), (_fn), (_flags), NULL, NULL) + timer_init_key((_timer), (_fn), (_flags), NULL, NULL)#define __init_timer_on_stack (_timer, _fn, _flags) \ init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)#endif
kernel/time/timer.c +4 -4
@@ -904,7 +904,7 @@ static void do_init_timer(struct timer_list *timer, }/** -* init_timer_key - initialize a timer +* timer_init_key - initialize a timer * @timer: the timer to be initialized * @func: timer callback function * @flags: timer flags
@@ -912,17 +912,17 @@ static void do_init_timer(struct timer_list *timer,* @key: lockdep class key of the fake lock used for tracking timer * sync lock dependencies * -* init_timer_key() must be done to a timer prior to calling *any* of the +* timer_init_key() must be done to a timer prior to calling *any* of the * other timer functions. */ -void init_timer_key (struct timer_list *timer, +void timer_init_key (struct timer_list *timer,void (*func)(struct timer_list *),unsigned int flags,const char *name,struct lock_class_key *key) {debug_init (timer);do_init_timer (timer, func, flags, name, key); } -EXPORT_SYMBOL (init_timer_key); +EXPORT_SYMBOL (timer_init_key);static inline void detach_timer (struct timer_list *timer,bool clear_pending) {
Signature · 1 line
2.45.2
PATCH 6/10 treewide, timers: Rename init_timer_on_stack_key() => timer_init_key_on_stack()
In reply to Ingo MolnarMove this API to the canonical timer_*() namespace.
--- include/linux/timer.h | 8 ++++---- kernel/time/timer.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
include/linux/timer.h +4 -4
@@ -72,12 +72,12 @@ void timer_init_key(struct timer_list *timer, const char *name, struct lock_class_key *key);#ifdef CONFIG_DEBUG_OBJECTS_TIMERS -extern void init_timer_on_stack_key (struct timer_list *timer, +extern void timer_init_key_on_stack (struct timer_list *timer,void (*func)(struct timer_list *),unsigned int flags,const char *name,struct lock_class_key *key);#else -static inline void init_timer_on_stack_key(struct timer_list *timer, +static inline void timer_init_key_on_stack(struct timer_list *timer, void (*func)(struct timer_list *), unsigned int flags, const char *name,
@@ -97,14 +97,14 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,#define __init_timer_on_stack (_timer, _fn, _flags) \ do { \ static struct lock_class_key __key; \ - init_timer_on_stack_key((_timer), (_fn), (_flags), \ + timer_init_key_on_stack((_timer), (_fn), (_flags), \ #_timer, &__key); \ } while (0)#else #define __init_timer (_timer, _fn, _flags) \ timer_init_key((_timer), (_fn), (_flags), NULL, NULL)#define __init_timer_on_stack (_timer, _fn, _flags) \ - init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL) + timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)#endif /**
kernel/time/timer.c +2 -2
@@ -850,7 +850,7 @@ static void do_init_timer(struct timer_list *timer,unsigned int flags, const char *name, struct lock_class_key *key); -void init_timer_on_stack_key (struct timer_list *timer, +void timer_init_key_on_stack (struct timer_list *timer,void (*func)(struct timer_list *),unsigned int flags,const char *name,struct lock_class_key *key)
@@ -858,7 +858,7 @@ void init_timer_on_stack_key(struct timer_list *timer,debug_object_init_on_stack (timer, &timer_debug_descr);do_init_timer (timer, func, flags, name, key); } -EXPORT_SYMBOL_GPL (init_timer_on_stack_key); +EXPORT_SYMBOL_GPL (timer_init_key_on_stack);void timer_destroy_on_stack (struct timer_list *timer) {
Signature · 1 line
2.45.2
PATCH 7/10 treewide, timers: Rename __init_timer() => __timer_init()
In reply to Ingo MolnarMove this API to the canonical __timer_*() namespace.
--- include/linux/timer.h | 6 +++--- include/linux/workqueue.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/timer.h +3 -3
@@ -88,7 +88,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,#endif #ifdef CONFIG_LOCKDEP -#define __init_timer (_timer, _fn, _flags) \ +#define __timer_init (_timer, _fn, _flags) \ do { \ static struct lock_class_key __key; \ timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\
@@ -101,7 +101,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer, #_timer, &__key); \ } while (0) #else -#define __init_timer (_timer, _fn, _flags) \ +#define __timer_init (_timer, _fn, _flags) \ timer_init_key((_timer), (_fn), (_flags), NULL, NULL)#define __init_timer_on_stack (_timer, _fn, _flags) \ timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)
@@ -118,7 +118,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,* be used and must be balanced with a call to timer_destroy_on_stack(). */ #define timer_setup (timer, callback, flags) \ - __init_timer((timer), (callback), (flags)) + __timer_init((timer), (callback), (flags))#define timer_setup_on_stack (timer, callback, flags) \ __init_timer_on_stack((timer), (callback), (flags))
include/linux/workqueue.h +1 -1
@@ -316,7 +316,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }#define __INIT_DELAYED_WORK (_work, _func, _tflags) \ do { \ INIT_WORK(&(_work)->work, (_func)); \ - __init_timer(&(_work)->timer, \ + __timer_init(&(_work)->timer, \ delayed_work_timer_fn, \ (_tflags) | TIMER_IRQSAFE); \ } while (0)
Signature · 1 line
2.45.2
PATCH 8/10 treewide, timers: Rename __init_timer_on_stack() => __timer_init_on_stack()
In reply to Ingo MolnarMove this API to the canonical __timer_*() namespace.
--- include/linux/timer.h | 6 +++--- include/linux/workqueue.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/timer.h +3 -3
@@ -94,7 +94,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer, timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\ } while (0) -#define __init_timer_on_stack (_timer, _fn, _flags) \ +#define __timer_init_on_stack (_timer, _fn, _flags) \ do { \ static struct lock_class_key __key; \ timer_init_key_on_stack((_timer), (_fn), (_flags), \
@@ -103,7 +103,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,#else #define __timer_init (_timer, _fn, _flags) \ timer_init_key((_timer), (_fn), (_flags), NULL, NULL) -#define __init_timer_on_stack (_timer, _fn, _flags) \ +#define __timer_init_on_stack (_timer, _fn, _flags) \ timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)#endif
@@ -121,7 +121,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer, __timer_init((timer), (callback), (flags))#define timer_setup_on_stack (timer, callback, flags) \ - __init_timer_on_stack((timer), (callback), (flags)) + __timer_init_on_stack((timer), (callback), (flags))#ifdef CONFIG_DEBUG_OBJECTS_TIMERS extern void timer_destroy_on_stack (struct timer_list *timer);
include/linux/workqueue.h +1 -1
@@ -324,7 +324,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; }#define __INIT_DELAYED_WORK_ONSTACK (_work, _func, _tflags) \ do { \ INIT_WORK_ONSTACK(&(_work)->work, (_func)); \ - __init_timer_on_stack(&(_work)->timer, \ + __timer_init_on_stack(&(_work)->timer, \ delayed_work_timer_fn, \ (_tflags) | TIMER_IRQSAFE); \ } while (0)
Signature · 1 line
2.45.2
PATCH 9/10 treewide, timers: Rename NEXT_TIMER_MAX_DELTA => TIMER_NEXT_MAX_DELTA
In reply to Ingo MolnarMove this macro to the canonical TIMER_* namespace.
--- arch/powerpc/kvm/booke.c | 8 ++++---- include/linux/timer.h | 2 +- kernel/time/timer.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-)
arch/powerpc/kvm/booke.c +4 -4
@@ -572,7 +572,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,/* * Return the number of jiffies until the next timeout. If the timeout is -* longer than the NEXT_TIMER_MAX_DELTA, then return NEXT_TIMER_MAX_DELTA +* longer than the TIMER_NEXT_MAX_DELTA, then return TIMER_NEXT_MAX_DELTA * because the larger value can break the timer APIs. */ static unsigned long watchdog_next_timeout (struct kvm_vcpu *vcpu)
@@ -598,7 +598,7 @@ static unsigned long watchdog_next_timeout(struct kvm_vcpu *vcpu)if (do_div (nr_jiffies, tb_ticks_per_jiffy)) nr_jiffies++; - return min_t(unsigned long long, nr_jiffies, NEXT_TIMER_MAX_DELTA); + return min_t(unsigned long long, nr_jiffies, TIMER_NEXT_MAX_DELTA); }static void arm_next_watchdog (struct kvm_vcpu *vcpu)
@@ -616,10 +616,10 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu)spin_lock_irqsave (&vcpu->arch.wdt_lock, flags); nr_jiffies =watchdog_next_timeout (vcpu);/* -* If the number of jiffies of watchdog timer >= NEXT_TIMER_MAX_DELTA +* If the number of jiffies of watchdog timer >= TIMER_NEXT_MAX_DELTA * then do not run the watchdog timer as this can break timer APIs. */ -if (nr_jiffies <NEXT_TIMER_MAX_DELTA ) +if (nr_jiffies <TIMER_NEXT_MAX_DELTA )mod_timer (&vcpu->arch.wdt_timer, jiffies + nr_jiffies);else timer_delete (&vcpu->arch.wdt_timer);
include/linux/timer.h +1 -1
@@ -156,7 +156,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);* The jiffies value which is added to now, when there is no timer * in the timer wheel: */ -#define NEXT_TIMER_MAX_DELTA ((1UL << 30) - 1) +#define TIMER_NEXT_MAX_DELTA ((1UL << 30) - 1)extern void add_timer (struct timer_list *timer);extern void add_timer_local (struct timer_list *timer);
kernel/time/timer.c +6 -6
@@ -1900,7 +1900,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)unsigned long clk, next, adj;unsigned lvl, offset =0 ; - next = base->clk +NEXT_TIMER_MAX_DELTA ; + next = base->clk +TIMER_NEXT_MAX_DELTA ; clk = base->clk;for (lvl =0 ; lvl <LVL_DEPTH ; lvl++, offset +=LVL_SIZE ) {int pos =next_pending_bucket (base, offset, clk &LVL_MASK );
@@ -1963,7 +1963,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)WRITE_ONCE (base->next_expiry, next); base->next_expiry_recalc = false; - base->timers_pending = !(next == base->clk +NEXT_TIMER_MAX_DELTA ); + base->timers_pending = !(next == base->clk +TIMER_NEXT_MAX_DELTA ); }#ifdef CONFIG_NO_HZ_COMMON
@@ -2015,7 +2015,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,* easy comparable to find out which base holds the first pending timer. */ if (!base->timers_pending) -WRITE_ONCE (base->next_expiry, basej +NEXT_TIMER_MAX_DELTA ); +WRITE_ONCE (base->next_expiry, basej +TIMER_NEXT_MAX_DELTA );return base->next_expiry; }
@@ -2399,7 +2399,7 @@ static inline void __run_timers(struct timer_base *base)* timer at this clk are that all matching timers have been * dequeued or no timer has been queued since * base::next_expiry was set to base::clk + -* NEXT_TIMER_MAX_DELTA. +* TIMER_NEXT_MAX_DELTA. */ WARN_ON_ONCE (!levels && !base->next_expiry_recalc && base->timers_pending);
@@ -2544,7 +2544,7 @@ int timers_prepare_cpu(unsigned int cpu)for (b =0 ; b <NR_BASES ; b++) { base =per_cpu_ptr (&timer_bases[b], cpu); base->clk = jiffies; - base->next_expiry = base->clk +NEXT_TIMER_MAX_DELTA ; + base->next_expiry = base->clk +TIMER_NEXT_MAX_DELTA ; base->next_expiry_recalc = false; base->timers_pending = false; base->is_idle = false;
@@ -2599,7 +2599,7 @@ static void __init init_timer_cpu(int cpu) base->cpu = cpu;raw_spin_lock_init (&base->lock); base->clk = jiffies; - base->next_expiry = base->clk +NEXT_TIMER_MAX_DELTA ; + base->next_expiry = base->clk +TIMER_NEXT_MAX_DELTA ;timer_base_init_expiry_lock (base); } }
Signature · 1 line
2.45.2
PATCH 10/10 treewide, timers: Rename init_timers() => timers_init()
In reply to Ingo MolnarMove this API to the canonical timers_*() namespace.
--- include/linux/timer.h | 2 +- init/main.c | 2 +- kernel/time/timer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/linux/timer.h +1 -1
@@ -168,7 +168,7 @@ extern int timer_delete(struct timer_list *timer);extern int timer_shutdown_sync (struct timer_list *timer);extern int timer_shutdown (struct timer_list *timer); -extern void init_timers (void ); +extern void timers_init (void );struct hrtimer ;extern enum hrtimer_restart it_real_fn (struct hrtimer *);
init/main.c +1 -1
@@ -1002,7 +1002,7 @@ void start_kernel(void)init_IRQ ();tick_init ();rcu_init_nohz (); -init_timers (); +timers_init ();srcu_init ();hrtimers_init ();softirq_init ();
kernel/time/timer.c +1 -1
@@ -2612,7 +2612,7 @@ static void __init init_timer_cpus(void)init_timer_cpu (cpu); } -void __init init_timers (void ) +void __init timers_init (void ) {init_timer_cpus ();posix_cputimers_init_work ();
Signature · 1 line
2.45.2
Re: [PATCH 01/10] rust: Rename timer_container_of() to hrtimer_container_of()
In reply to Ingo MolnarQuoted 7 lines · Ingo Molnar
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 fortimer_list, make sure there's no clash of namespaces, at least on the conceptual plane.
Andreas should Ack, but I quickly build-tested it and it looks OK:
Cc'ing the rust-for-linux ML too.
Thanks!
Cheers,
Miguel
Re: [PATCH 01/10] rust: Rename timer_container_of() to hrtimer_container_of()
Quoted 5 lines · Miguel Ojeda
Quoted 4 lines · Ingo Molnar
This primitive is dealing with 'struct hrtimer' objects, not 'struct
timer_list' objects - so clarify the name.
Quoted 7 lines
Quoted 3 lines
We want to introduce the
timer_container_of()symbol in the kernel fortimer_list, make sure there's no clash of namespaces, at least on the conceptual plane.Andreas should Ack, but I quickly build-tested it and it looks OK:
Acked-by Miguel Ojeda <[email protected]>
Thank you!
Ingo
Quoted 19 lines · Ingo Molnar
[ Changes since -v1:
- Exclude the 6 APIs that need further work, keep 9 APIs/symbols
-timer_init_on_stack_key()->timer_init_key_on_stack()
- Fixes
- Rebase to -rc2
]Ingo Molnar (10):
rust: Renametimer_container_of()tohrtimer_container_of()treewide, timers: Renamefrom_timer()=>timer_container_of()treewide, timers: Renametry_to_del_timer_sync()=>timer_delete_sync_try()treewide, timers: Renamedestroy_timer_on_stack()=>timer_destroy_on_stack()treewide, timers: Renameinit_timer_key()=>timer_init_key()treewide, timers: Renameinit_timer_on_stack_key()=>timer_init_key_on_stack()treewide, timers: Rename__init_timer()=>__timer_init()treewide, timers: Rename__init_timer_on_stack()=>__timer_init_on_stack()treewide, timers: RenameNEXT_TIMER_MAX_DELTA=>TIMER_NEXT_MAX_DELTAtreewide, timers: Renameinit_timers()=>timers_init()
Quoted 1 line
708 files changed, 997 insertions(+), 997 deletions(-)
Thomas, if these changes are broadly acceptable to you as a first step, I'd like to propose the following merge order:
These 7 patches with a low -next cross section could go into tip:timer/core the regular way, if they pass review & testing:
rust: Rename timer_container_of() to hrtimer_container_of()
5 files changed, 6 insertions(+), 6 deletions(-)
timers: Rename init_timer_key() => timer_init_key()
2 files changed, 8 insertions(+), 8 deletions(-)
timers: Rename init_timer_on_stack_key() => timer_init_key_on_stack()
2 files changed, 6 insertions(+), 6 deletions(-)
timers: Rename __init_timer() => __timer_init()
2 files changed, 4 insertions(+), 4 deletions(-)
timers: Rename __init_timer_on_stack() => __timer_init_on_stack()
2 files changed, 4 insertions(+), 4 deletions(-)
timers: Rename NEXT_TIMER_MAX_DELTA => TIMER_NEXT_MAX_DELTA
3 files changed, 11 insertions(+), 11 deletions(-)
timers: Rename init_timers() => timers_init()
3 files changed, 3 insertions(+), 3 deletions(-)
( Note that I've removed the 'treewide' prefix for these patches, as
these really are mostly timer subsystem internal changes. )
The three largest changes, which patches I've already ordered to be at the tail of the series in the latest mingo/tip.git/WIP.timers/core tree, would go to Linus separately, two days before -rc1 or so, assuming everything passes review & testing:
treewide, timers: Rename try_to_del_timer_sync() => timer_delete_sync_try()
7 files changed, 17 insertions(+), 17 deletions(-)
treewide, timers: Rename destroy_timer_on_stack() => timer_destroy_on_stack()
26 files changed, 35 insertions(+), 35 deletions(-)
treewide, timers: Rename from_timer() => timer_container_of()
697 files changed, 923 insertions(+), 923 deletions(-)
In addition to this I'll also work on the timer_start_*() API cleanup & restructuring you suggested. Please send me the prelimary cocci script you had for this that you mentioned in the previous mail and I'll try dusting it all off. (Or I'll write new scripts if you cannot find them.)
Thanks,
Ingo
Andreas Hindborg
maintainerRe: [PATCH 01/10] rust: Rename timer_container_of() to hrtimer_container_of()
In reply to Ingo MolnarHi Ingo,
Quoted 6 lines · Ingo Molnar
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 fortimer_list, make sure there's no clash of namespaces, at least on the conceptual plane.
This associated trait function is defined on the trait HasHrTimer, so I don't think there is any risk of confusing it with the C (or future Rust) timer_container_of methods/functions.
As to symbol names, there is no risk of conflicts. The rust symbols are mangled and get quite long.
If you really want this change it's OK with me, but I would prefer to drop it.
Best regards,
Andreas Hindborg