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.

Started byAllen Pais <allen.lkml@gmail.com>
First post2017-09-21 19:10 +0200
Last post2017-09-22 08:30 +0200
Articles 20 on this page of 61 — 3 participants

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 1 of 4  [1] 2 3 4  Next page →


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

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 00/64] use setup_timer() helper function.
Message-ID<usd97-3OI-3@gated-at.bofh.it>
 This series uses setup_timer() helper function. The series
addresses the files under drivers/net/*.


Allen Pais (64):
  drivers: net: de4x: use setup_timer() helper.
  drivers: net: b44: use setup_timer() helper.
  drivers: net: pcnet32: use setup_timer() helper.
  drivers: net: brcm80211: use setup_timer() helper.
  drivers : net: niu: use setup_timer() helper.
  drivers: net: bcm63xx: use setup_timer() helper.
  drivers: net: declance: use setup_timer() helper.
  drivers: net: am79c961: use setup_timer() helper.
  drivers: net: et131x: use setup_timer() helper.
  drivers: net: appletalk: cops: use setup_timer() helper.
  drivers: net: rsi_91x: use setup_timer() helper.
  drivers: net: atp: use setup_timer() helper.
  drivers: net: ns83820: use setup_timer() helper.
  drivers: net: ixgb: use setup_timer() helper.
  drivers: net: sundance: use setup_timer() helper.
  drivers: net: tg3: use setup_timer() helper.
  drivers: net: sdla: use setup_timer() helper.
  drivers: net: cisco_hdlc: use setup_timer() helper.
  drivers: net: slip: use setup_timer() helper.
  drivers: net: spider_net: use setup_timer() helper.
  drivers: net: sun: cassini: use setup_timer() helper.
  drivers: net: natsemi: use setup_timer() helper.
  drivers: net: winbond-840: use setup_timer() helper.
  drivers: net: enic: use setup_timer() helper.
  drivers: net: bnx2: use setup_timer() helper.
  drivers: net: xen-netback: use setup_timer() helper.
  drivers: net: atmel: use setup_timer() helper.
  drivers: net: hippi: use setup_timer() helper.
  drivers: net: smsc: use setup_timer() helper.
  drivers: net: qlogic: use setup_timer() helper.
  drivers: net: e1000e: use setup_timer() helper.
  drivers: net: amd: use setup_timer() helper.
  drivers: net: amd8111e: use setup_timer() helper.
  drivers: net: eql: use setup_timer() helper.
  drivers: net: can: usb: use setup_timer() helper.
  drivers: net: can: use setup_timer() helper.
  drivers: net: arcnet: use setup_timer() helper.
  drivers: net: ath6kl: use setup_timer() helper.
  drivers: net: sun: use setup_timer() helper.
  drivers: net: sis900: use setup_timer() helper.
  drivers: net: packetengines: use setup_timer() helper.
  drivers: net: mlx5: use setup_timer() helper.
  drivers: net: mlx4: use setup_timer() helper.
  drivers: net: pxa168: use setup_timer() helper.
  drivers: net: fealnx: use setup_timer() helper.
  drivers: net: dmfe: use setup_timer() helper.
  drivers: net: bnxt: use setup_timer() helper.
  drivers: net: amd: use setup_timer() helper.
  drivers: net: adi: use setup_timer() helper.
  drivers: net: can: sja1000: use setup_timer() helper.
  drivers: net: caif: use setup_timer() helper.
  drivers: net: appletalk: use setup_timer() helper.
  drivers: net: dscc: use setup_timer() helper.
  drivers: net: hdlc_ppp: use setup_timer() helper.
  drivers: net: hamradio: use setup_timer() helper.
  drivers: net: cpsw_ale: use setup_timer() helper.
  drivers: net: stmmac: use setup_timer() helper.
  drivers: net: packetengines: use setup_timer() helper.
  drivers: net: i40evf: use setup_timer() helper.
  drivers: net: uli526x: use setup_timer() helper.
  drivers: net: enic: use setup_timer() helper.
  drivers: net: cxgb: use setup_timer() helper.
  drivers: net: bnx2x: use setup_timer() helper.
  drivers: net: lmc: use setup_timer() helper.

 drivers/net/appletalk/cops.c                              |  4 +---
 drivers/net/appletalk/ltpc.c                              |  4 +---
 drivers/net/arcnet/arcnet.c                               |  4 +---
 drivers/net/caif/caif_hsi.c                               | 15 ++++++---------
 drivers/net/can/grcan.c                                   | 10 ++++------
 drivers/net/can/sja1000/peak_pcmcia.c                     |  4 +---
 drivers/net/can/usb/peak_usb/pcan_usb.c                   |  5 ++---
 drivers/net/eql.c                                         |  4 +---
 drivers/net/ethernet/adi/bfin_mac.c                       |  5 ++---
 drivers/net/ethernet/agere/et131x.c                       |  5 ++---
 drivers/net/ethernet/amd/a2065.c                          |  7 +++----
 drivers/net/ethernet/amd/am79c961a.c                      |  4 +---
 drivers/net/ethernet/amd/amd8111e.c                       |  5 ++---
 drivers/net/ethernet/amd/declance.c                       |  6 +++---
 drivers/net/ethernet/amd/pcnet32.c                        |  5 ++---
 drivers/net/ethernet/amd/sunlance.c                       |  5 ++---
 drivers/net/ethernet/broadcom/b44.c                       |  4 +---
 drivers/net/ethernet/broadcom/bcm63xx_enet.c              |  5 ++---
 drivers/net/ethernet/broadcom/bnx2.c                      |  4 +---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c          |  4 +---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c                 |  4 +---
 drivers/net/ethernet/broadcom/tg3.c                       |  4 +---
 drivers/net/ethernet/chelsio/cxgb/sge.c                   |  5 ++---
 drivers/net/ethernet/cisco/enic/enic_clsf.h               |  5 ++---
 drivers/net/ethernet/cisco/enic/enic_main.c               |  5 ++---
 drivers/net/ethernet/dec/tulip/de4x5.c                    |  5 ++---
 drivers/net/ethernet/dec/tulip/dmfe.c                     |  4 +---
 drivers/net/ethernet/dec/tulip/uli526x.c                  |  4 +---
 drivers/net/ethernet/dec/tulip/winbond-840.c              |  4 +---
 drivers/net/ethernet/dlink/sundance.c                     |  4 +---
 drivers/net/ethernet/fealnx.c                             |  8 ++------
 drivers/net/ethernet/intel/e1000e/netdev.c                | 11 ++++-------
 drivers/net/ethernet/intel/i40evf/i40evf_main.c           |  5 ++---
 drivers/net/ethernet/intel/ixgb/ixgb_main.c               |  5 ++---
 drivers/net/ethernet/marvell/pxa168_eth.c                 |  5 ++---
 drivers/net/ethernet/mellanox/mlx4/catas.c                |  4 +---
 drivers/net/ethernet/mellanox/mlx5/core/health.c          |  4 +---
 drivers/net/ethernet/natsemi/natsemi.c                    |  4 +---
 drivers/net/ethernet/natsemi/ns83820.c                    |  4 +---
 drivers/net/ethernet/packetengines/hamachi.c              |  4 +---
 drivers/net/ethernet/packetengines/yellowfin.c            |  4 +---
 drivers/net/ethernet/qlogic/qla3xxx.c                     |  4 +---
 drivers/net/ethernet/realtek/atp.c                        |  4 +---
 drivers/net/ethernet/sis/sis900.c                         |  4 +---
 drivers/net/ethernet/smsc/epic100.c                       |  4 +---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c         |  4 +---
 drivers/net/ethernet/sun/cassini.c                        |  5 +----
 drivers/net/ethernet/sun/niu.c                            |  4 +---
 drivers/net/ethernet/sun/sungem.c                         |  4 +---
 drivers/net/ethernet/ti/cpsw_ale.c                        |  4 +---
 drivers/net/ethernet/toshiba/spider_net.c                 | 12 +++++-------
 drivers/net/hamradio/6pack.c                              |  4 +---
 drivers/net/hippi/rrunner.c                               |  4 +---
 drivers/net/slip/slip.c                                   |  8 ++------
 drivers/net/wan/dscc4.c                                   |  4 +---
 drivers/net/wan/hdlc_cisco.c                              |  4 +---
 drivers/net/wan/hdlc_ppp.c                                |  4 +---
 drivers/net/wan/lmc/lmc_main.c                            |  4 +---
 drivers/net/wan/sdla.c                                    |  4 +---
 drivers/net/wireless/ath/ath6kl/txrx.c                    |  4 +---
 drivers/net/wireless/atmel/atmel.c                        |  5 ++---
 .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c   |  5 ++---
 drivers/net/wireless/rsi/rsi_91x_hal.c                    |  5 ++---
 drivers/net/xen-netback/interface.c                       |  3 +--
 64 files changed, 102 insertions(+), 216 deletions(-)

-- 
2.7.4

[toc] | [next] | [standalone]


#1736867 — [PATCH 24/64] drivers: net: enic: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 24/64] drivers: net: enic: use setup_timer() helper.
Message-ID<usd98-3OI-15@gated-at.bofh.it>
In reply to#1736866
    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/cisco/enic/enic_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index d24ee1a..4a11baf 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2846,9 +2846,8 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Setup notification timer, HW reset task, and wq locks
 	 */
 
-	init_timer(&enic->notify_timer);
-	enic->notify_timer.function = enic_notify_timer;
-	enic->notify_timer.data = (unsigned long)enic;
+	setup_timer(&enic->notify_timer, enic_notify_timer,
+		    (unsigned long)enic);
 
 	enic_set_rx_coal_setting(enic);
 	INIT_WORK(&enic->reset, enic_reset);
-- 
2.7.4

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


#1736868 — [PATCH 16/64] drivers: net: tg3: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 16/64] drivers: net: tg3: use setup_timer() helper.
Message-ID<usd98-3OI-17@gated-at.bofh.it>
In reply to#1736866
    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/tg3.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 656e6af..d8d5f20 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11087,9 +11087,7 @@ static void tg3_timer_init(struct tg3 *tp)
 	tp->asf_multiplier = (HZ / tp->timer_offset) *
 			     TG3_FW_UPDATE_FREQ_SEC;
 
-	init_timer(&tp->timer);
-	tp->timer.data = (unsigned long) tp;
-	tp->timer.function = tg3_timer;
+	setup_timer(&tp->timer, tg3_timer, (unsigned long)tp);
 }
 
 static void tg3_timer_start(struct tg3 *tp)
-- 
2.7.4

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


#1736869 — [PATCH 15/64] drivers: net: sundance: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 15/64] drivers: net: sundance: use setup_timer() helper.
Message-ID<usd98-3OI-19@gated-at.bofh.it>
In reply to#1736866
    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/dlink/sundance.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index 2704bcf..6ca9e98 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -913,10 +913,8 @@ static int netdev_open(struct net_device *dev)
 			   ioread16(ioaddr + MACCtrl1), ioread16(ioaddr + MACCtrl0));
 
 	/* Set the timer to check for link beat. */
-	init_timer(&np->timer);
+	setup_timer(&np->timer, netdev_timer, (unsigned long)dev);
 	np->timer.expires = jiffies + 3*HZ;
-	np->timer.data = (unsigned long)dev;
-	np->timer.function = netdev_timer;				/* timer handler */
 	add_timer(&np->timer);
 
 	/* Enable interrupts by setting the interrupt mask. */
-- 
2.7.4

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


#1736870 — [PATCH 12/64] drivers: net: atp: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 12/64] drivers: net: atp: use setup_timer() helper.
Message-ID<usd98-3OI-23@gated-at.bofh.it>
In reply to#1736866
    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/realtek/atp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index bed3468..bdc3833 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -438,10 +438,8 @@ static int net_open(struct net_device *dev)
 
 	hardware_init(dev);
 
-	init_timer(&lp->timer);
+	setup_timer(&lp->timer, atp_timed_checker, (unsigned long)dev);
 	lp->timer.expires = jiffies + TIMED_CHECKER;
-	lp->timer.data = (unsigned long)dev;
-	lp->timer.function = atp_timed_checker;    /* timer handler */
 	add_timer(&lp->timer);
 
 	netif_start_queue(dev);
-- 
2.7.4

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


#1736871 — [PATCH 03/64] drivers: net: pcnet32: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 03/64] drivers: net: pcnet32: use setup_timer() helper.
Message-ID<usd98-3OI-21@gated-at.bofh.it>
In reply to#1736866
    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/pcnet32.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 7f60d17..e461536 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1970,9 +1970,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 			lp->options |= PCNET32_PORT_MII;
 	}
 
-	init_timer(&lp->watchdog_timer);
-	lp->watchdog_timer.data = (unsigned long)dev;
-	lp->watchdog_timer.function = (void *)&pcnet32_watchdog;
+	setup_timer(&lp->watchdog_timer, (void *)&pcnet32_watchdog,
+		    (unsigned long)dev);
 
 	/* The PCNET32-specific entries in the device structure. */
 	dev->netdev_ops = &pcnet32_netdev_ops;
-- 
2.7.4

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


#1736872 — [PATCH 29/64] drivers: net: smsc: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 29/64] drivers: net: smsc: use setup_timer() helper.
Message-ID<usd98-3OI-27@gated-at.bofh.it>
In reply to#1736866
    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/smsc/epic100.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index 6a0e1d4..2a97248 100644
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -739,10 +739,8 @@ static int epic_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(&ep->timer);
+	setup_timer(&ep->timer, epic_timer, (unsigned long)dev);
 	ep->timer.expires = jiffies + 3*HZ;
-	ep->timer.data = (unsigned long)dev;
-	ep->timer.function = epic_timer;				/* timer handler */
 	add_timer(&ep->timer);
 
 	return rc;
-- 
2.7.4

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


#1736873 — [PATCH 30/64] drivers: net: qlogic: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 30/64] drivers: net: qlogic: use setup_timer() helper.
Message-ID<usd98-3OI-25@gated-at.bofh.it>
In reply to#1736866
    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/qlogic/qla3xxx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 2991179..05479d4 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3891,10 +3891,8 @@ static int ql3xxx_probe(struct pci_dev *pdev,
 	INIT_DELAYED_WORK(&qdev->tx_timeout_work, ql_tx_timeout_work);
 	INIT_DELAYED_WORK(&qdev->link_state_work, ql_link_state_machine_work);
 
-	init_timer(&qdev->adapter_timer);
-	qdev->adapter_timer.function = ql3xxx_timer;
+	setup_timer(&qdev->adapter_timer, ql3xxx_timer, (unsigned long)qdev);
 	qdev->adapter_timer.expires = jiffies + HZ * 2;	/* two second delay */
-	qdev->adapter_timer.data = (unsigned long)qdev;
 
 	if (!cards_found) {
 		pr_alert("%s\n", DRV_STRING);
-- 
2.7.4

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


#1736874 — [PATCH 35/64] drivers: net: can: usb: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 35/64] drivers: net: can: usb: use setup_timer() helper.
Message-ID<usd99-3OI-29@gated-at.bofh.it>
In reply to#1736866
    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/usb/peak_usb/pcan_usb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c
index 838545c..7e10dbd 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb.c
@@ -798,9 +798,8 @@ static int pcan_usb_init(struct peak_usb_device *dev)
 	int err;
 
 	/* initialize a timer needed to wait for hardware restart */
-	init_timer(&pdev->restart_timer);
-	pdev->restart_timer.function = pcan_usb_restart;
-	pdev->restart_timer.data = (unsigned long)dev;
+	setup_timer(&pdev->restart_timer, pcan_usb_restart,
+		    (unsigned long)dev);
 
 	/*
 	 * explicit use of dev_xxx() instead of netdev_xxx() here:
-- 
2.7.4

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


#1736875 — [PATCH 27/64] drivers: net: atmel: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 27/64] drivers: net: atmel: use setup_timer() helper.
Message-ID<usd99-3OI-31@gated-at.bofh.it>
In reply to#1736866
    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/atmel/atmel.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c
index b68436b..e816d53 100644
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
@@ -1579,11 +1579,10 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
 	priv->default_beacon_period = priv->beacon_period = 100;
 	priv->listen_interval = 1;
 
-	init_timer(&priv->management_timer);
+	setup_timer(&priv->management_timer, atmel_management_timer,
+		    (unsigned long)dev);
 	spin_lock_init(&priv->irqlock);
 	spin_lock_init(&priv->timerlock);
-	priv->management_timer.function = atmel_management_timer;
-	priv->management_timer.data = (unsigned long) dev;
 
 	dev->netdev_ops = &atmel_netdev_ops;
 	dev->wireless_handlers = &atmel_handler_def;
-- 
2.7.4

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


#1736876 — [PATCH 06/64] drivers: net: bcm63xx: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 06/64] drivers: net: bcm63xx: use setup_timer() helper.
Message-ID<usd99-3OI-33@gated-at.bofh.it>
In reply to#1736866
    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/bcm63xx_enet.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 4f3845a..f8bbbbf 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1857,9 +1857,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
 	spin_lock_init(&priv->rx_lock);
 
 	/* init rx timeout (used for oom) */
-	init_timer(&priv->rx_timeout);
-	priv->rx_timeout.function = bcm_enet_refill_rx_timer;
-	priv->rx_timeout.data = (unsigned long)dev;
+	setup_timer(&priv->rx_timeout, bcm_enet_refill_rx_timer,
+		    (unsigned long)dev);
 
 	/* init the mib update lock&work */
 	mutex_init(&priv->mib_update_lock);
-- 
2.7.4

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


#1736878 — [PATCH 07/64] drivers: net: declance: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 07/64] drivers: net: declance: use setup_timer() helper.
Message-ID<usd99-3OI-35@gated-at.bofh.it>
In reply to#1736866
    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/declance.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 82cc813..9bdf81c 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -1246,9 +1246,9 @@ static int dec_lance_probe(struct device *bdev, const int type)
 	 * can occur from interrupts (ex. IPv6).  So we
 	 * use a timer to try again later when necessary. -DaveM
 	 */
-	init_timer(&lp->multicast_timer);
-	lp->multicast_timer.data = (unsigned long) dev;
-	lp->multicast_timer.function = lance_set_multicast_retry;
+	setup_timer(&lp->multicast_timer, lance_set_multicast_retry,
+		    (unsigned long)dev);
+
 
 	ret = register_netdev(dev);
 	if (ret) {
-- 
2.7.4

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


#1736880 — [PATCH 11/64] drivers: net: rsi_91x: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 11/64] drivers: net: rsi_91x: use setup_timer() helper.
Message-ID<usd99-3OI-43@gated-at.bofh.it>
In reply to#1736866
    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/rsi/rsi_91x_hal.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c
index 070dfd6..7ad286d 100644
--- a/drivers/net/wireless/rsi/rsi_91x_hal.c
+++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
@@ -411,9 +411,8 @@ static void bl_cmd_timeout(unsigned long priv)
 
 static int bl_start_cmd_timer(struct rsi_hw *adapter, u32 timeout)
 {
-	init_timer(&adapter->bl_cmd_timer);
-	adapter->bl_cmd_timer.data = (unsigned long)adapter;
-	adapter->bl_cmd_timer.function = (void *)&bl_cmd_timeout;
+	setup_timer(&adapter->bl_cmd_timer, (void *)&bl_cmd_timeout,
+		    (unsigned long)adapter);
 	adapter->bl_cmd_timer.expires = (msecs_to_jiffies(timeout) + jiffies);
 
 	adapter->blcmd_timer_expired = false;
-- 
2.7.4

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


#1736881 — [PATCH 05/64] drivers : net: niu: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 05/64] drivers : net: niu: use setup_timer() helper.
Message-ID<usd99-3OI-45@gated-at.bofh.it>
In reply to#1736866
    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/sun/niu.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 6a4e8e1..bde19b3 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -6123,10 +6123,8 @@ static int niu_open(struct net_device *dev)
 
 	err = niu_init_hw(np);
 	if (!err) {
-		init_timer(&np->timer);
+		setup_timer(&np->timer, niu_timer, (unsigned long)np);
 		np->timer.expires = jiffies + HZ;
-		np->timer.data = (unsigned long) np;
-		np->timer.function = niu_timer;
 
 		err = niu_enable_interrupts(np, 1);
 		if (err)
-- 
2.7.4

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


#1736882 — [PATCH 38/64] drivers: net: ath6kl: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 38/64] drivers: net: ath6kl: use setup_timer() helper.
Message-ID<usd99-3OI-41@gated-at.bofh.it>
In reply to#1736866
    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/ath/ath6kl/txrx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index e6b2517..4e5cc2b 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1753,9 +1753,7 @@ void aggr_conn_init(struct ath6kl_vif *vif, struct aggr_info *aggr_info,
 
 	aggr_conn->aggr_sz = AGGR_SZ_DEFAULT;
 	aggr_conn->dev = vif->ndev;
-	init_timer(&aggr_conn->timer);
-	aggr_conn->timer.function = aggr_timeout;
-	aggr_conn->timer.data = (unsigned long) aggr_conn;
+	setup_timer(&aggr_conn->timer, aggr_timeout, (unsigned long)aggr_conn);
 	aggr_conn->aggr_info = aggr_info;
 
 	aggr_conn->timer_scheduled = false;
-- 
2.7.4

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


#1736883 — [PATCH 17/64] drivers: net: sdla: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 17/64] drivers: net: sdla: use setup_timer() helper.
Message-ID<usd99-3OI-47@gated-at.bofh.it>
In reply to#1736866
    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/wan/sdla.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 236c625..0cc4890 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -1617,10 +1617,8 @@ static void setup_sdla(struct net_device *dev)
 	flp->deassoc		= sdla_deassoc;
 	flp->dlci_conf		= sdla_dlci_conf;
 
-	init_timer(&flp->timer);
+	setup_timer(&flp->timer, sdla_poll, (unsigned long)dev);
 	flp->timer.expires	= 1;
-	flp->timer.data		= (unsigned long) dev;
-	flp->timer.function	= sdla_poll;
 }
 
 static struct net_device *sdla;
-- 
2.7.4

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


#1736884 — [PATCH 25/64] drivers: net: bnx2: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 25/64] drivers: net: bnx2: use setup_timer() helper.
Message-ID<usd99-3OI-49@gated-at.bofh.it>
In reply to#1736866
    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/bnx2.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index e3af1f3..b3055a7 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8462,10 +8462,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 	bnx2_set_default_link(bp);
 	bp->req_flow_ctrl = FLOW_CTRL_RX | FLOW_CTRL_TX;
 
-	init_timer(&bp->timer);
+	setup_timer(&bp->timer, bnx2_timer, (unsigned long)bp);
 	bp->timer.expires = RUN_AT(BNX2_TIMER_INTERVAL);
-	bp->timer.data = (unsigned long) bp;
-	bp->timer.function = bnx2_timer;
 
 #ifdef BCM_CNIC
 	if (bnx2_shmem_rd(bp, BNX2_ISCSI_INITIATOR) & BNX2_ISCSI_INITIATOR_EN)
-- 
2.7.4

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


#1736885 — [PATCH 19/64] drivers: net: slip: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 19/64] drivers: net: slip: use setup_timer() helper.
Message-ID<usd99-3OI-53@gated-at.bofh.it>
In reply to#1736866
    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/slip/slip.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 436dd78..eb8a189 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -763,12 +763,8 @@ static struct slip *sl_alloc(dev_t line)
 	sl->mode        = SL_MODE_DEFAULT;
 #ifdef CONFIG_SLIP_SMART
 	/* initialize timer_list struct */
-	init_timer(&sl->keepalive_timer);
-	sl->keepalive_timer.data = (unsigned long)sl;
-	sl->keepalive_timer.function = sl_keepalive;
-	init_timer(&sl->outfill_timer);
-	sl->outfill_timer.data = (unsigned long)sl;
-	sl->outfill_timer.function = sl_outfill;
+	setup_timer(&sl->keepalive_timer, sl_keepalive, (unsigned long)sl);
+	setup_timer(&sl->outfill_timer, sl_outfill, (unsigned long)sl);
 #endif
 	slip_devs[i] = dev;
 	return sl;
-- 
2.7.4

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


#1736886 — [PATCH 10/64] drivers: net: appletalk: cops: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 10/64] drivers: net: appletalk: cops: use setup_timer() helper.
Message-ID<usd9a-3OI-55@gated-at.bofh.it>
In reply to#1736866
    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/appletalk/cops.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 486e1e6..caf0428 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -424,9 +424,7 @@ static int cops_open(struct net_device *dev)
 		 */
 		if(lp->board==TANGENT)	/* Poll 20 times per second */
 		{
-		    init_timer(&cops_timer);
-		    cops_timer.function = cops_poll;
-		    cops_timer.data 	= (unsigned long)dev;
+		    setup_timer(&cops_timer, cops_poll, (unsigned long)dev);
 		    cops_timer.expires 	= jiffies + HZ/20;
 		    add_timer(&cops_timer);
 		} 
-- 
2.7.4

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


#1736887 — [PATCH 14/64] drivers: net: ixgb: use setup_timer() helper.

FromAllen Pais <allen.lkml@gmail.com>
Date2017-09-21 19:10 +0200
Subject[PATCH 14/64] drivers: net: ixgb: use setup_timer() helper.
Message-ID<usd99-3OI-51@gated-at.bofh.it>
In reply to#1736866
    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/ixgb/ixgb_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 5a71319..1e6ec22 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -508,9 +508,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	adapter->part_num = ixgb_get_ee_pba_number(&adapter->hw);
 
-	init_timer(&adapter->watchdog_timer);
-	adapter->watchdog_timer.function = ixgb_watchdog;
-	adapter->watchdog_timer.data = (unsigned long)adapter;
+	setup_timer(&adapter->watchdog_timer, ixgb_watchdog,
+		    (unsigned long)adapter);
 
 	INIT_WORK(&adapter->tx_timeout_task, ixgb_tx_timeout_task);
 
-- 
2.7.4

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


Page 1 of 4  [1] 2 3 4  Next page →

Back to top | Article view | linux.kernel


csiph-web