diff options
| author | Ingo Molnar <[email protected]> | 2025-05-09 05:51:14 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2025-06-08 07:07:37 +0000 |
| commit | 41cb08555c4164996d67c78b3bf1c658075b75f1 (patch) | |
| tree | 6ead7ce69b0ba98293649b17376d079d5b3ca405 /drivers/net/ethernet/intel/igb/igb_main.c | |
| parent | Merge tag 'kbuild-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| download | kernel-41cb08555c4164996d67c78b3bf1c658075b75f1.tar.gz kernel-41cb08555c4164996d67c78b3bf1c658075b75f1.zip | |
treewide, timers: Rename from_timer() to timer_container_of()
Move this API to the canonical timer_*() namespace.
[ tglx: Redone against pre rc1 ]
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lore.kernel.org/all/[email protected]
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 9e9a5900e6e5..b76a154e635e 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -5465,7 +5465,8 @@ 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); } @@ -5555,7 +5556,8 @@ 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); } |
