Skip to content

Commit 5327ef9

Browse files
musicakcdavem330
authored andcommitted
net: tulip: Use setup_timer()
Convert a call to init_timer and accompanying intializations of the timer's data and function fields to a call to setup_timer. The Coccinelle semantic patch that fixes this problem is as follows: // <smpl> @@ expression t,f,d; @@ -init_timer(&t); +setup_timer(&t,f,d); -t.data = d; -t.function = f; // </smpl> Signed-off-by: Amitoj Kaur Chawla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4b69d87 commit 5327ef9

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

drivers/net/ethernet/dec/tulip/tulip_core.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,7 @@ static void tulip_up(struct net_device *dev)
505505
tp->timer.expires = RUN_AT(next_tick);
506506
add_timer(&tp->timer);
507507
#ifdef CONFIG_TULIP_NAPI
508-
init_timer(&tp->oom_timer);
509-
tp->oom_timer.data = (unsigned long)dev;
510-
tp->oom_timer.function = oom_timer;
508+
setup_timer(&tp->oom_timer, oom_timer, (unsigned long)dev);
511509
#endif
512510
}
513511

@@ -782,9 +780,8 @@ static void tulip_down (struct net_device *dev)
782780

783781
spin_unlock_irqrestore (&tp->lock, flags);
784782

785-
init_timer(&tp->timer);
786-
tp->timer.data = (unsigned long)dev;
787-
tp->timer.function = tulip_tbl[tp->chip_id].media_timer;
783+
setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer,
784+
(unsigned long)dev);
788785

789786
dev->if_port = tp->saved_if_port;
790787

@@ -1475,9 +1472,8 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
14751472
tp->csr0 = csr0;
14761473
spin_lock_init(&tp->lock);
14771474
spin_lock_init(&tp->mii_lock);
1478-
init_timer(&tp->timer);
1479-
tp->timer.data = (unsigned long)dev;
1480-
tp->timer.function = tulip_tbl[tp->chip_id].media_timer;
1475+
setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer,
1476+
(unsigned long)dev);
14811477

14821478
INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task);
14831479

0 commit comments

Comments
 (0)