[49/58] net: neterion: Convert timers to use timer_setup()

Message ID	1508200182-104605-50-git-send-email-keescook@chromium.org
State	Accepted, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Kees Cook <keescook@chromium.org> To: "David S. Miller" <davem@davemloft.net> Cc: Kees Cook <keescook@chromium.org>, Jon Mason <jdmason@kudzu.us>, netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org Subject: [PATCH 49/58] net: neterion: Convert timers to use timer_setup() Date: Mon, 16 Oct 2017 17:29:33 -0700 Message-Id: <1508200182-104605-50-git-send-email-keescook@chromium.org> In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org> References: <1508200182-104605-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	networking: Convert timers to use timer_setup() \| expand [00/58] networking: Convert timers to use timer_setup() [01/58] net/decnet: Convert timers to use timer_setup() [02/58] net/lapb: Convert timers to use timer_setup() [03/58] net/rose: Convert timers to use timer_setup() [04/58] net/irda-usb: Convert timers to use timer_setup() [05/58] net/irda/bfin_sir: Convert timers to use timer_setup() [06/58] net/ti/tlan: Convert timers to use timer_setup() [07/58] net/usb/usbnet: Convert timers to use timer_setup() [08/58] net/wireless/ray_cs: Convert timers to use timer_setup() [09/58] net/irda: Convert timers to use timer_setup() [10/58] isdn/hisax: Convert timers to use timer_setup() [11/58] net/hamradio/6pack: Convert timers to use timer_setup() [12/58] xfrm: Convert timers to use timer_setup() [13/58] ethernet/broadcom: Convert timers to use timer_setup() [14/58] net: tulip: de2104x: Convert timers to use timer_setup() [15/58] pcmcia/electra_cf: Convert timers to use timer_setup() [16/58] net: ethernet: stmmac: Convert timers to use timer_setup() [17/58] net/cw1200: Convert timers to use timer_setup() [18/58] net: vxge: Convert timers to use timer_setup() [19/58] drivers/atm/suni: Convert timers to use timer_setup() [20/58] atm: idt77252: Convert timers to use timer_setup() [21/58] net: tulip: Convert timers to use timer_setup() [22/58] net: can: Convert timers to use timer_setup() [23/58] drivers/net/3com: Convert timers to use timer_setup() [24/58] chelsio: Convert timers to use timer_setup() [25/58] net: amd8111e: Convert timers to use timer_setup() [26/58] bna: Convert timers to use timer_setup() [27/58] net: dl2k: Convert timers to use timer_setup() [28/58] net: ksz884x: Convert timers to use timer_setup() [29/58] forcedeth: Convert timers to use timer_setup() [30/58] mISDN: Convert timers to use timer_setup() [31/58] isdn/gigaset: Use kzalloc instead of open-coded field zeroing [32/58] isdn/gigaset: Convert timers to use timer_setup() [33/58] net: sched: Convert timers to use timer_setup() [34/58] netfilter: ipset: Convert timers to use timer_setup() [35/58] inet/connection_sock: Convert timers to use timer_setup() [36/58] inet: frags: Convert timers to use timer_setup() [37/58] net/core: Collapse redundant sk_timer callback data assignments [38/58] hdlc: Convert timers to use timer_setup() [39/58] appletalk: Remove unneeded synchronization [40/58] drivers/net/appletalk: Convert timers to use timer_setup() [41/58] net/atm/mpc: Stop using open-coded timer .data field [42/58] isdnloop: Convert timers to use timer_setup() [43/58] net: ethernet: apple: Convert timers to use timer_setup() [44/58] net: ethernet: sun: Convert timers to use timer_setup() [45/58] net: seeq: Convert timers to use timer_setup() [46/58] hamradio/scc: Convert timers to use timer_setup() [47/58] net/ethernet/sgi: Convert timers to use timer_setup() [48/58] net: usb: Convert timers to use timer_setup() [49/58] net: neterion: Convert timers to use timer_setup() [50/58] net: hns: Convert timers to use timer_setup() [51/58] ethernet/intel: Convert timers to use timer_setup() [52/58] net/core: Convert sk_timer users to use timer_setup() [53/58] net: atm: Convert timers to use timer_setup() [54/58] net/xen-netback: Convert timers to use timer_setup() [55/58] net: fs_enet: Remove unused timer [56/58] um: net: Convert timers to use timer_setup() [57/58] ipv4: timewait: Convert timers to use timer_setup() [58/58] sunrpc: Convert timers to use timer_setup()

Message ID

1508200182-104605-50-git-send-email-keescook@chromium.org

State

Accepted, archived

Delegated to:

David Miller

Headers

From: Kees Cook <keescook@chromium.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: Kees Cook <keescook@chromium.org>, Jon Mason <jdmason@kudzu.us>,
	netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 49/58] net: neterion: Convert timers to use timer_setup()
Date: Mon, 16 Oct 2017 17:29:33 -0700
Message-Id: <1508200182-104605-50-git-send-email-keescook@chromium.org>
In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org>
References: <1508200182-104605-1-git-send-email-keescook@chromium.org>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

networking: Convert timers to use timer_setup() | expand

Commit Message

Kees Cook Oct. 17, 2017, 12:29 a.m. UTC

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: Jon Mason <jdmason@kudzu.us>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/net/ethernet/neterion/s2io.c | 13 ++++---------
 drivers/net/ethernet/neterion/s2io.h |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 462eda926b1c..b8983e73265a 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -337,12 +337,6 @@  static const char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
 #define S2IO_TEST_LEN	ARRAY_SIZE(s2io_gstrings)
 #define S2IO_STRINGS_LEN	(S2IO_TEST_LEN * ETH_GSTRING_LEN)
 
-#define S2IO_TIMER_CONF(timer, handle, arg, exp)	\
-	init_timer(&timer);				\
-	timer.function = handle;			\
-	timer.data = (unsigned long)arg;		\
-	mod_timer(&timer, (jiffies + exp))		\
-
 /* copy mac addr to def_mac_addr array */
 static void do_s2io_copy_mac_addr(struct s2io_nic *sp, int offset, u64 mac_addr)
 {
@@ -4193,9 +4187,9 @@  static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 static void
-s2io_alarm_handle(unsigned long data)
+s2io_alarm_handle(struct timer_list *t)
 {
-	struct s2io_nic *sp = (struct s2io_nic *)data;
+	struct s2io_nic *sp = from_timer(sp, t, alarm_timer);
 	struct net_device *dev = sp->dev;
 
 	s2io_handle_errors(dev);
@@ -7186,7 +7180,8 @@  static int s2io_card_up(struct s2io_nic *sp)
 		return -ENODEV;
 	}
 
-	S2IO_TIMER_CONF(sp->alarm_timer, s2io_alarm_handle, sp, (HZ/2));
+	timer_setup(&sp->alarm_timer, s2io_alarm_handle, 0);
+	mod_timer(&sp->alarm_timer, jiffies + HZ / 2);
 
 	set_bit(__S2IO_STATE_CARD_UP, &sp->state);
 
diff --git a/drivers/net/ethernet/neterion/s2io.h b/drivers/net/ethernet/neterion/s2io.h
index 6c5997dc8afc..1a24a7218794 100644
--- a/drivers/net/ethernet/neterion/s2io.h
+++ b/drivers/net/ethernet/neterion/s2io.h
@@ -1094,7 +1094,7 @@  static int s2io_poll_msix(struct napi_struct *napi, int budget);
 static int s2io_poll_inta(struct napi_struct *napi, int budget);
 static void s2io_init_pci(struct s2io_nic * sp);
 static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr);
-static void s2io_alarm_handle(unsigned long data);
+static void s2io_alarm_handle(struct timer_list *t);
 static irqreturn_t
 s2io_msix_ring_handle(int irq, void *dev_id);
 static irqreturn_t

[49/58] net: neterion: Convert timers to use timer_setup()

Commit Message

Patch