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

Commit 0ff624fb authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

drivers/net: 3com/3c515: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a78ec0d4

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

+5 −5
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static struct net_device *corkscrew_scan(int unit); 
static int corkscrew_setup(struct net_device *dev, int ioaddr,

			    struct pnp_dev *idev, int card_number);

static int corkscrew_open(struct net_device *dev);

static void corkscrew_timer(unsigned long arg);

static void corkscrew_timer(struct timer_list *t);

static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,

					struct net_device *dev);

static int corkscrew_rx(struct net_device *dev);
@@ -627,7 +627,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, 


	spin_lock_init(&vp->lock);



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

	timer_setup(&vp->timer, corkscrew_timer, 0);



	/* Read the station address from the EEPROM. */

	EL3WINDOW(0);
@@ -869,11 +869,11 @@ static int corkscrew_open(struct net_device *dev) 
	return 0;

}



static void corkscrew_timer(unsigned long data)

static void corkscrew_timer(struct timer_list *t)

{

#ifdef AUTOMEDIA

	struct net_device *dev = (struct net_device *) data;

	struct corkscrew_private *vp = netdev_priv(dev);

	struct corkscrew_private *vp = from_timer(vp, t, timer);

	struct net_device *dev = vp->our_dev;

	int ioaddr = dev->base_addr;

	unsigned long flags;

	int ok = 0;