Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b6490de authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by David S. Miller
Browse files

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: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de55558d

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

+2 −8
Original line number Diff line number Diff line
@@ -1601,15 +1601,9 @@ vortex_up(struct net_device *dev) 
				dev->name, media_tbl[dev->if_port].name);

	}



	init_timer(&vp->timer);

	setup_timer(&vp->timer, vortex_timer, (unsigned long)dev);

	vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);

	vp->timer.data = (unsigned long)dev;

	vp->timer.function = vortex_timer;		/* timer handler */

	add_timer(&vp->timer);



	init_timer(&vp->rx_oom_timer);

	vp->rx_oom_timer.data = (unsigned long)dev;

	vp->rx_oom_timer.function = rx_oom_timer;

	setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);



	if (vortex_debug > 1)

		pr_debug("%s: Initial media type %s.\n",