diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-17 03:29:33 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-18 14:40:26 +0300 |
| commit | e84a2ac9ffa9b1ba211c8982f07cd92f60239c3e (patch) | |
| tree | 27e271d09957c434d5d92d5f9937ec72c335ed32 /drivers/net/ethernet/neterion/s2io.h | |
| parent | d28bb967aa928d5cfd50a9a182f3b4218088c79d (diff) | |
| download | linux-e84a2ac9ffa9b1ba211c8982f07cd92f60239c3e.tar.xz | |
net: neterion: 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: Jon Mason <jdmason@kudzu.us>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion/s2io.h')
| -rw-r--r-- | drivers/net/ethernet/neterion/s2io.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |