Skip to content

Commit 5b6490d

Browse files
musicakcdavem330
authored andcommitted
3c59x: 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 de55558 commit 5b6490d

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/net/ethernet/3com/3c59x.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,15 +1601,9 @@ vortex_up(struct net_device *dev)
16011601
dev->name, media_tbl[dev->if_port].name);
16021602
}
16031603

1604-
init_timer(&vp->timer);
1604+
setup_timer(&vp->timer, vortex_timer, (unsigned long)dev);
16051605
vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);
1606-
vp->timer.data = (unsigned long)dev;
1607-
vp->timer.function = vortex_timer; /* timer handler */
1608-
add_timer(&vp->timer);
1609-
1610-
init_timer(&vp->rx_oom_timer);
1611-
vp->rx_oom_timer.data = (unsigned long)dev;
1612-
vp->rx_oom_timer.function = rx_oom_timer;
1606+
setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);
16131607

16141608
if (vortex_debug > 1)
16151609
pr_debug("%s: Initial media type %s.\n",

0 commit comments

Comments
 (0)