summaryrefslogtreecommitdiff
path: root/net/atm/mpc.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-16 17:29:37 -0700
committerDavid S. Miller <davem@davemloft.net>2017-10-18 12:40:27 +0100
commitba421793505f91026cccbf9398ff866dd308036d (patch)
treee9bbcadbd1034d82be5d1811578536baca3eb5b9 /net/atm/mpc.c
parent99767f278ccf74a1857069bb3eec991e572f94cd (diff)
net: atm: 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. Also drops a redundant initialization that is already set up by DEFINE_TIMER. Cc: "David S. Miller" <davem@davemloft.net> Cc: Hans Liljestrand <ishkamiel@gmail.com> Cc: "Reshetova, Elena" <elena.reshetova@intel.com> Cc: Bhumika Goyal <bhumirks@gmail.com> Cc: Johannes Berg <johannes.berg@intel.com> Cc: Roopa Prabhu <roopa@cumulusnetworks.com> Cc: Augusto Mecking Caringi <augustocaringi@gmail.com> Cc: Jarod Wilson <jarod@redhat.com> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Alexey Dobriyan <adobriyan@gmail.com> 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 'net/atm/mpc.c')
-rw-r--r--net/atm/mpc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 5677147209e8..b43d99430eb6 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -799,7 +799,6 @@ static int atm_mpoa_mpoad_attach(struct atm_vcc *vcc, int arg)
int err;
if (mpcs == NULL) {
- init_timer(&mpc_timer);
mpc_timer_refresh();
/* This lets us now how our LECs are doing */