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

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

net: tulip: 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: David Howells <dhowells@redhat.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Philippe Reynes <tremyfr@gmail.com>
Cc: "yuval.shaia@oracle.com" <yuval.shaia@oracle.com>
Cc: netdev@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d2ceaa6

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

+6 −6
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static int de4x5_init(struct net_device *dev); 
static int     de4x5_sw_reset(struct net_device *dev);

static int     de4x5_rx(struct net_device *dev);

static int     de4x5_tx(struct net_device *dev);

static void    de4x5_ast(struct net_device *dev);

static void    de4x5_ast(struct timer_list *t);

static int     de4x5_txur(struct net_device *dev);

static int     de4x5_rx_ovfc(struct net_device *dev);
@@ -1147,8 +1147,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) 
	lp->timeout = -1;

	lp->gendev = gendev;

	spin_lock_init(&lp->lock);

	setup_timer(&lp->timer, (void (*)(unsigned long))de4x5_ast,

		    (unsigned long)dev);

	timer_setup(&lp->timer, de4x5_ast, 0);

	de4x5_parse_params(dev);



	/*
@@ -1741,9 +1740,10 @@ de4x5_tx(struct net_device *dev) 
}



static void

de4x5_ast(struct net_device *dev)

de4x5_ast(struct timer_list *t)

{

	struct de4x5_private *lp = netdev_priv(dev);

	struct de4x5_private *lp = from_timer(lp, t, timer);

	struct net_device *dev = dev_get_drvdata(lp->gendev);

	int next_tick = DE4X5_AUTOSENSE_MS;

	int dt;
@@ -2369,7 +2369,7 @@ autoconf_media(struct net_device *dev) 
	lp->media = INIT;

	lp->tcount = 0;



	de4x5_ast(dev);

	de4x5_ast(&lp->timer);



	return lp->media;

}

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

+5 −5
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void dmfe_phy_write_1bit(void __iomem *, u32); 
static u16 dmfe_phy_read_1bit(void __iomem *);

static u8 dmfe_sense_speed(struct dmfe_board_info *);

static void dmfe_process_mode(struct dmfe_board_info *);

static void dmfe_timer(unsigned long);

static void dmfe_timer(struct timer_list *);

static inline u32 cal_CRC(unsigned char *, unsigned int, u8);

static void dmfe_rx_packet(struct net_device *, struct dmfe_board_info *);

static void dmfe_free_tx_pkt(struct net_device *, struct dmfe_board_info *);
@@ -596,7 +596,7 @@ static int dmfe_open(struct net_device *dev) 
	netif_wake_queue(dev);



	/* set and active a timer process */

	setup_timer(&db->timer, dmfe_timer, (unsigned long)dev);

	timer_setup(&db->timer, dmfe_timer, 0);

	db->timer.expires = DMFE_TIMER_WUT + HZ * 2;

	add_timer(&db->timer);
@@ -1128,10 +1128,10 @@ static const struct ethtool_ops netdev_ethtool_ops = { 
 *	Dynamic media sense, allocate Rx buffer...

 */



static void dmfe_timer(unsigned long data)

static void dmfe_timer(struct timer_list *t)

{

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

	struct dmfe_board_info *db = netdev_priv(dev);

	struct dmfe_board_info *db = from_timer(db, t, timer);

	struct net_device *dev = pci_get_drvdata(db->pdev);

	void __iomem *ioaddr = db->ioaddr;

	u32 tmp_cr8;

	unsigned char tmp_cr12;

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

+3 −3
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ int tulip_refill_rx(struct net_device *dev) 


#ifdef CONFIG_TULIP_NAPI



void oom_timer(unsigned long data)

void oom_timer(struct timer_list *t)

{

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

	struct tulip_private *tp = netdev_priv(dev);

	struct tulip_private *tp = from_timer(tp, t, oom_timer);



	napi_schedule(&tp->napi);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ void pnic_lnk_change(struct net_device *dev, int csr5) 
	}

}



void pnic_timer(unsigned long data)

void pnic_timer(struct timer_list *t)

{

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

	struct tulip_private *tp = netdev_priv(dev);

	struct tulip_private *tp = from_timer(tp, t, timer);

	struct net_device *dev = tp->dev;

	void __iomem *ioaddr = tp->base_addr;

	int next_tick = 60*HZ;

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

+3 −3
Original line number Diff line number Diff line
@@ -76,10 +76,10 @@ 
#include <linux/delay.h>





void pnic2_timer(unsigned long data)

void pnic2_timer(struct timer_list *t)

{

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

	struct tulip_private *tp = netdev_priv(dev);

	struct tulip_private *tp = from_timer(tp, t, timer);

	struct net_device *dev = tp->dev;

	void __iomem *ioaddr = tp->base_addr;

	int next_tick = 60*HZ;