summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/hfc_2bds0.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-16 17:28:54 -0700
committerDavid S. Miller <davem@davemloft.net>2017-10-18 12:39:37 +0100
commit5e8b824d91b43baa3125ab941e42137ef458e72f (patch)
treebf1acaa5b682c61635ca80b3d65784bf5aedd34b /drivers/isdn/hisax/hfc_2bds0.c
parentd8eb7e262d0d438b23e69d836175b9cec3e4bb90 (diff)
downloadop-kernel-dev-5e8b824d91b43baa3125ab941e42137ef458e72f.zip
op-kernel-dev-5e8b824d91b43baa3125ab941e42137ef458e72f.tar.gz
isdn/hisax: 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: Karsten Keil <isdn@linux-pingi.de> Cc: Geliang Tang <geliangtang@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> 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/isdn/hisax/hfc_2bds0.c')
-rw-r--r--drivers/isdn/hisax/hfc_2bds0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index ad8597a..86b8217 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -1014,7 +1014,7 @@ setstack_hfcd(struct PStack *st, struct IsdnCardState *cs)
}
static void
-hfc_dbusy_timer(struct IsdnCardState *cs)
+hfc_dbusy_timer(struct timer_list *t)
{
}
@@ -1073,6 +1073,6 @@ set_cs_func(struct IsdnCardState *cs)
cs->writeisacfifo = &dummyf;
cs->BC_Read_Reg = &ReadReg;
cs->BC_Write_Reg = &WriteReg;
- setup_timer(&cs->dbusytimer, (void *)hfc_dbusy_timer, (long)cs);
+ timer_setup(&cs->dbusytimer, hfc_dbusy_timer, 0);
INIT_WORK(&cs->tqueue, hfcd_bh);
}
OpenPOWER on IntegriCloud