Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1736866 > unrolled thread

[PATCH 00/64] use setup_timer() helper function.

Back to article view | Back to linux.kernel

Contents

  [PATCH 00/64] use setup_timer() helper function. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 24/64] drivers: net: enic: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 16/64] drivers: net: tg3: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 15/64] drivers: net: sundance: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 12/64] drivers: net: atp: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 03/64] drivers: net: pcnet32: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 29/64] drivers: net: smsc: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 30/64] drivers: net: qlogic: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 35/64] drivers: net: can: usb: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 27/64] drivers: net: atmel: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 06/64] drivers: net: bcm63xx: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 07/64] drivers: net: declance: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 11/64] drivers: net: rsi_91x: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 05/64] drivers : net: niu: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 38/64] drivers: net: ath6kl: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 17/64] drivers: net: sdla: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 25/64] drivers: net: bnx2: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 19/64] drivers: net: slip: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 10/64] drivers: net: appletalk: cops: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 14/64] drivers: net: ixgb: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 20/64] drivers: net: spider_net: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 36/64] drivers: net: can: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 22/64] drivers: net: natsemi: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 01/64] drivers: net: de4x: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 33/64] drivers: net: amd8111e: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 28/64] drivers: net: hippi: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 13/64] drivers: net: ns83820: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 04/64] drivers: net: brcm80211: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 02/64] drivers: net: b44: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 31/64] drivers: net: e1000e: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 26/64] drivers: net: xen-netback: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 37/64] drivers: net: arcnet: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:10 +0200
    [PATCH 55/64] drivers: net: hamradio: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 40/64] drivers: net: sis900: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 42/64] drivers: net: mlx5: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 58/64] drivers: net: packetengines: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 56/64] drivers: net: cpsw_ale: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 60/64] drivers: net: uli526x: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 62/64] drivers: net: cxgb: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 43/64] drivers: net: mlx4: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 59/64] drivers: net: i40evf: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 39/64] drivers: net: sun: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 54/64] drivers: net: hdlc_ppp: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 52/64] drivers: net: appletalk: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 46/64] drivers: net: dmfe: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 51/64] drivers: net: caif: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 64/64] drivers: net: lmc: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 57/64] drivers: net: stmmac: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 49/64] drivers: net: adi: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 63/64] drivers: net: bnx2x: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 50/64] drivers: net: can: sja1000: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 61/64] drivers: net: enic: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 53/64] drivers: net: dscc: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 41/64] drivers: net: packetengines: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:20 +0200
    [PATCH 44/64] drivers: net: pxa168: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:30 +0200
    [PATCH 48/64] drivers: net: amd: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:30 +0200
    [PATCH 45/64] drivers: net: fealnx: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:30 +0200
    [PATCH 47/64] drivers: net: bnxt: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:30 +0200
    [PATCH 08/64] drivers: net: am79c961: use setup_timer() helper. Allen Pais <allen.lkml@gmail.com> - 2017-09-21 19:40 +0200
    Re: [PATCH 00/64] use setup_timer() helper function. David Miller <davem@davemloft.net> - 2017-09-21 20:40 +0200
      Re: [PATCH 00/64] use setup_timer() helper function. Allen <allen.lkml@gmail.com> - 2017-09-22 08:30 +0200

Page 2 of 4 — ← Prev page 1 [2] 3 4  Next page →

#1736888 — [PATCH 20/64] drivers: net: spider_net: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/toshiba/spider_net.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c
index cec9e70..a913538 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -2256,16 +2256,14 @@ spider_net_setup_netdev(struct spider_net_card *card)
 
 	pci_set_drvdata(card->pdev, netdev);
 
-	init_timer(&card->tx_timer);
-	card->tx_timer.function =
-		(void (*)(unsigned long)) spider_net_cleanup_tx_ring;
-	card->tx_timer.data = (unsigned long) card;
+	setup_timer(&card->tx_timer,
+		    (void(*)(unsigned long))spider_net_cleanup_tx_ring,
+		    (unsigned long)card);
 	netdev->irq = card->pdev->irq;
 
 	card->aneg_count = 0;
-	init_timer(&card->aneg_timer);
-	card->aneg_timer.function = spider_net_link_phy;
-	card->aneg_timer.data = (unsigned long) card;
+	setup_timer(&card->aneg_timer, spider_net_link_phy,
+		    (unsigned long)card);
 
 	netif_napi_add(netdev, &card->napi,
 		       spider_net_poll, SPIDER_NET_NAPI_WEIGHT);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736889 — [PATCH 36/64] drivers: net: can: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/can/grcan.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index a7be12d..8570cfd 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1626,13 +1626,11 @@ static int grcan_setup_netdev(struct platform_device *ofdev,
 	spin_lock_init(&priv->lock);
 
 	if (priv->need_txbug_workaround) {
-		init_timer(&priv->rr_timer);
-		priv->rr_timer.function = grcan_running_reset;
-		priv->rr_timer.data = (unsigned long)dev;
+		setup_timer(&priv->rr_timer, grcan_running_reset,
+			    (unsigned long)dev);
 
-		init_timer(&priv->hang_timer);
-		priv->hang_timer.function = grcan_initiate_running_reset;
-		priv->hang_timer.data = (unsigned long)dev;
+		setup_timer(&priv->hang_timer, grcan_initiate_running_reset,
+			    (unsigned long)dev);
 	}
 
 	netif_napi_add(dev, &priv->napi, grcan_poll, GRCAN_NAPI_WEIGHT);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736890 — [PATCH 22/64] drivers: net: natsemi: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/natsemi/natsemi.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index 18af2a2..dedeacd 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -1571,10 +1571,8 @@ static int netdev_open(struct net_device *dev)
 			dev->name, (int)readl(ioaddr + ChipCmd));
 
 	/* Set the timer to check for link beat. */
-	init_timer(&np->timer);
+	setup_timer(&np->timer, netdev_timer, (unsigned long)dev);
 	np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ);
-	np->timer.data = (unsigned long)dev;
-	np->timer.function = netdev_timer; /* timer handler */
 	add_timer(&np->timer);
 
 	return 0;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736891 — [PATCH 01/64] drivers: net: de4x: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/dec/tulip/de4x5.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index 0affee9..299812e 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -1147,9 +1147,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
 	lp->timeout = -1;
 	lp->gendev = gendev;
 	spin_lock_init(&lp->lock);
-	init_timer(&lp->timer);
-	lp->timer.function = (void (*)(unsigned long))de4x5_ast;
-	lp->timer.data = (unsigned long)dev;
+	setup_timer(&lp->timer, (void (*)(unsigned long))de4x5_ast,
+		    (unsigned long)dev);
 	de4x5_parse_params(dev);
 
 	/*
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736892 — [PATCH 33/64] drivers: net: amd8111e: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/amd/amd8111e.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 7b5df56..7f22af6 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -1883,9 +1883,8 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
 
 	/* Initialize software ipg timer */
 	if(lp->options & OPTION_DYN_IPG_ENABLE){
-		init_timer(&lp->ipg_data.ipg_timer);
-		lp->ipg_data.ipg_timer.data = (unsigned long) dev;
-		lp->ipg_data.ipg_timer.function = (void *)&amd8111e_config_ipg;
+		setup_timer(&lp->ipg_data.ipg_timer,
+			    (void *)&amd8111e_config_ipg, (unsigned long)dev);
 		lp->ipg_data.ipg_timer.expires = jiffies +
 						 IPG_CONVERGE_JIFFIES;
 		lp->ipg_data.ipg = DEFAULT_IPG;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736893 — [PATCH 28/64] drivers: net: hippi: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/hippi/rrunner.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 71ddadb..76cc140 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -1229,10 +1229,8 @@ static int rr_open(struct net_device *dev)
 
 	/* Set the timer to switch to check for link beat and perhaps switch
 	   to an alternate media type. */
-	init_timer(&rrpriv->timer);
+	setup_timer(&rrpriv->timer, rr_timer, (unsigned long)dev);
 	rrpriv->timer.expires = RUN_AT(5*HZ);           /* 5 sec. watchdog */
-	rrpriv->timer.data = (unsigned long)dev;
-	rrpriv->timer.function = rr_timer;               /* timer handler */
 	add_timer(&rrpriv->timer);
 
 	netif_start_queue(dev);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736894 — [PATCH 13/64] drivers: net: ns83820: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/natsemi/ns83820.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index 729095d..99d3c78 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -1652,9 +1652,7 @@ static int ns83820_open(struct net_device *ndev)
 	writel(0, dev->base + TXDP_HI);
 	writel(desc, dev->base + TXDP);
 
-	init_timer(&dev->tx_watchdog);
-	dev->tx_watchdog.data = (unsigned long)ndev;
-	dev->tx_watchdog.function = ns83820_tx_watch;
+	setup_timer(&dev->tx_watchdog, ns83820_tx_watch, (unsigned long)ndev);
 	mod_timer(&dev->tx_watchdog, jiffies + 2*HZ);
 
 	netif_start_queue(ndev);	/* FIXME: wait for phy to come up */
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736895 — [PATCH 04/64] drivers: net: brcm80211: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index aaed4ab..ab3f223 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3260,9 +3260,8 @@ static void brcmf_init_escan(struct brcmf_cfg80211_info *cfg)
 			    brcmf_cfg80211_escan_handler);
 	cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE;
 	/* Init scan_timeout timer */
-	init_timer(&cfg->escan_timeout);
-	cfg->escan_timeout.data = (unsigned long) cfg;
-	cfg->escan_timeout.function = brcmf_escan_timeout;
+	setup_timer(&cfg->escan_timeout, brcmf_escan_timeout,
+		    (unsigned long)cfg);
 	INIT_WORK(&cfg->escan_timeout_work,
 		  brcmf_cfg80211_escan_timeout_worker);
 }
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736896 — [PATCH 02/64] drivers: net: b44: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/broadcom/b44.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index a1125d1..42e44fc 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -1474,10 +1474,8 @@ static int b44_open(struct net_device *dev)
 		goto out;
 	}
 
-	init_timer(&bp->timer);
+	setup_timer(&bp->timer, b44_timer, (unsigned long)bp);
 	bp->timer.expires = jiffies + HZ;
-	bp->timer.data = (unsigned long) bp;
-	bp->timer.function = b44_timer;
 	add_timer(&bp->timer);
 
 	b44_enable_ints(bp);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736897 — [PATCH 31/64] drivers: net: e1000e: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 327dfe5..8436c5f 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7252,13 +7252,10 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		goto err_eeprom;
 	}
 
-	init_timer(&adapter->watchdog_timer);
-	adapter->watchdog_timer.function = e1000_watchdog;
-	adapter->watchdog_timer.data = (unsigned long)adapter;
-
-	init_timer(&adapter->phy_info_timer);
-	adapter->phy_info_timer.function = e1000_update_phy_info;
-	adapter->phy_info_timer.data = (unsigned long)adapter;
+	setup_timer(&adapter->watchdog_timer, e1000_watchdog,
+		    (unsigned long)adapter);
+	setup_timer(&adapter->phy_info_timer, e1000_update_phy_info,
+		    (unsigned long)adapter);
 
 	INIT_WORK(&adapter->reset_task, e1000_reset_task);
 	INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736898 — [PATCH 26/64] drivers: net: xen-netback: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/xen-netback/interface.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index ee8ed9da..dcfcb15 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -520,8 +520,7 @@ int xenvif_init_queue(struct xenvif_queue *queue)
 
 	queue->credit_bytes = queue->remaining_credit = ~0UL;
 	queue->credit_usec  = 0UL;
-	init_timer(&queue->credit_timeout);
-	queue->credit_timeout.function = xenvif_tx_credit_callback;
+	setup_timer(&queue->credit_timeout, xenvif_tx_credit_callback, 0UL);
 	queue->credit_window_start = get_jiffies_64();
 
 	queue->rx_queue_max = XENVIF_RX_QUEUE_BYTES;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736899 — [PATCH 37/64] drivers: net: arcnet: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/arcnet/arcnet.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index fcfccbb..13236b2 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -450,9 +450,7 @@ struct net_device *alloc_arcdev(const char *name)
 
 		lp->dev = dev;
 		spin_lock_init(&lp->lock);
-		init_timer(&lp->timer);
-		lp->timer.data = (unsigned long) dev;
-		lp->timer.function = arcnet_timer;
+		setup_timer(&lp->timer, arcnet_timer, (unsigned long)dev);
 	}
 
 	return dev;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736901 — [PATCH 55/64] drivers: net: hamradio: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/hamradio/6pack.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 021a8ec..97fe8df 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -623,9 +623,7 @@ static int sixpack_open(struct tty_struct *tty)
 
 	netif_start_queue(dev);
 
-	init_timer(&sp->tx_t);
-	sp->tx_t.function = sp_xmit_on_air;
-	sp->tx_t.data = (unsigned long) sp;
+	setup_timer(&sp->tx_t, sp_xmit_on_air, (unsigned long)sp);
 
 	init_timer(&sp->resync_t);
 
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736902 — [PATCH 40/64] drivers: net: sis900: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/sis/sis900.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 40bd883..cb61247 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -1065,10 +1065,8 @@ sis900_open(struct net_device *net_dev)
 
 	/* Set the timer to switch to check for link beat and perhaps switch
 	   to an alternate media type. */
-	init_timer(&sis_priv->timer);
+	setup_timer(&sis_priv->timer, sis900_timer, (unsigned long)net_dev);
 	sis_priv->timer.expires = jiffies + HZ;
-	sis_priv->timer.data = (unsigned long)net_dev;
-	sis_priv->timer.function = sis900_timer;
 	add_timer(&sis_priv->timer);
 
 	return 0;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736903 — [PATCH 42/64] drivers: net: mlx5: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/health.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index 8aea0a0..a89a68c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -320,15 +320,13 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev)
 {
 	struct mlx5_core_health *health = &dev->priv.health;
 
-	init_timer(&health->timer);
+	setup_timer(&health->timer, poll_health, (unsigned long)dev);
 	health->sick = 0;
 	clear_bit(MLX5_DROP_NEW_HEALTH_WORK, &health->flags);
 	clear_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags);
 	health->health = &dev->iseg->health;
 	health->health_counter = &dev->iseg->health_counter;
 
-	health->timer.data = (unsigned long)dev;
-	health->timer.function = poll_health;
 	health->timer.expires = round_jiffies(jiffies + MLX5_HEALTH_POLL_INTERVAL);
 	add_timer(&health->timer);
 }
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736905 — [PATCH 58/64] drivers: net: packetengines: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/packetengines/hamachi.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index 482b85e..77bc7cc 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -979,10 +979,8 @@ static int hamachi_open(struct net_device *dev)
 			   dev->name, readw(ioaddr + RxStatus), readw(ioaddr + TxStatus));
 	}
 	/* Set the timer to check for link beat. */
-	init_timer(&hmp->timer);
+	setup_timer(&hmp->timer, hamachi_timer, (unsigned long)dev);
 	hmp->timer.expires = RUN_AT((24*HZ)/10);			/* 2.4 sec. */
-	hmp->timer.data = (unsigned long)dev;
-	hmp->timer.function = hamachi_timer;				/* timer handler */
 	add_timer(&hmp->timer);
 
 	return 0;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736906 — [PATCH 56/64] drivers: net: cpsw_ale: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/ti/cpsw_ale.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c
index ddd43e0..cd1185e 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.c
+++ b/drivers/net/ethernet/ti/cpsw_ale.c
@@ -859,9 +859,7 @@ void cpsw_ale_start(struct cpsw_ale *ale)
 	cpsw_ale_control_set(ale, 0, ALE_ENABLE, 1);
 	cpsw_ale_control_set(ale, 0, ALE_CLEAR, 1);
 
-	init_timer(&ale->timer);
-	ale->timer.data	    = (unsigned long)ale;
-	ale->timer.function = cpsw_ale_timer;
+	setup_timer(&ale->timer, cpsw_ale_timer, (unsigned long)ale);
 	if (ale->ageout) {
 		ale->timer.expires = jiffies + ale->ageout;
 		add_timer(&ale->timer);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736907 — [PATCH 60/64] drivers: net: uli526x: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/dec/tulip/uli526x.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index 7fc248e..5fbbc0c 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -491,10 +491,8 @@ static int uli526x_open(struct net_device *dev)
 	netif_wake_queue(dev);
 
 	/* set and active a timer process */
-	init_timer(&db->timer);
+	setup_timer(&db->timer, uli526x_timer, (unsigned long)dev);
 	db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
-	db->timer.data = (unsigned long)dev;
-	db->timer.function = uli526x_timer;
 	add_timer(&db->timer);
 
 	return 0;
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736908 — [PATCH 62/64] drivers: net: cxgb: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/chelsio/cxgb/sge.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
index 0f13a7f..75e4399 100644
--- a/drivers/net/ethernet/chelsio/cxgb/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
@@ -2075,9 +2075,8 @@ struct sge *t1_sge_create(struct adapter *adapter, struct sge_params *p)
 			goto nomem_port;
 	}
 
-	init_timer(&sge->tx_reclaim_timer);
-	sge->tx_reclaim_timer.data = (unsigned long)sge;
-	sge->tx_reclaim_timer.function = sge_tx_reclaim_cb;
+	setup_timer(&sge->tx_reclaim_timer, sge_tx_reclaim_cb,
+		    (unsigned long)sge);
 
 	if (is_T2(sge->adapter)) {
 		init_timer(&sge->espibug_timer);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1736910 — [PATCH 43/64] drivers: net: mlx4: use setup_timer() helper.

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/ethernet/mellanox/mlx4/catas.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c
index 53daa6c..de0f9e5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/catas.c
+++ b/drivers/net/ethernet/mellanox/mlx4/catas.c
@@ -277,7 +277,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev)
 	phys_addr_t addr;
 
 	INIT_LIST_HEAD(&priv->catas_err.list);
-	init_timer(&priv->catas_err.timer);
+	setup_timer(&priv->catas_err.timer, poll_catas, (unsigned long)dev);
 	priv->catas_err.map = NULL;
 
 	if (!mlx4_is_slave(dev)) {
@@ -293,8 +293,6 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev)
 		}
 	}
 
-	priv->catas_err.timer.data     = (unsigned long) dev;
-	priv->catas_err.timer.function = poll_catas;
 	priv->catas_err.timer.expires  =
 		round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL);
 	add_timer(&priv->catas_err.timer);
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

Page 2 of 4 — ← Prev page 1 [2] 3 4  Next page →

Back to top | Article view | linux.kernel

csiph-web