aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dec/tulip/timer.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2025-05-09 05:51:14 +0000
committerThomas Gleixner <[email protected]>2025-06-08 07:07:37 +0000
commit41cb08555c4164996d67c78b3bf1c658075b75f1 (patch)
tree6ead7ce69b0ba98293649b17376d079d5b3ca405 /drivers/net/ethernet/dec/tulip/timer.c
parentMerge tag 'kbuild-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff)
downloadkernel-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/dec/tulip/timer.c')
-rw-r--r--drivers/net/ethernet/dec/tulip/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/dec/tulip/timer.c b/drivers/net/ethernet/dec/tulip/timer.c
index 642e9dfc5451..ca0c509b601c 100644
--- a/drivers/net/ethernet/dec/tulip/timer.c
+++ b/drivers/net/ethernet/dec/tulip/timer.c
@@ -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;